Skip to content

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

feat(merge): Consolidate squash/rebase messages into single informative line

Maximilian Roos801ccf2dbe9e
diff --git a/README.md b/README.md
index d05f5bac5..93d314640 100644
--- a/README.md
+++ b/README.md
@@ -16,17 +16,23 @@ Running ten agents on different features? `wt switch --create feature-a`, `wt sw
Automates the full lifecycle: create worktree, work, merge back, remove worktree.
+<!-- Output generated from: tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap -->
```bash
$ wt switch --create fix-auth
# Shell now in ../repo.fix-auth/
# Agent works, makes changes, then:
$ wt merge
-πŸ”„ Switching to main...
-πŸ”„ Staging changes (3 modified)...
-πŸ”„ Merging fix-auth β†’ main...
-βœ… Merged and pushed
-βœ… Removed worktree
+πŸ”„ Merging 1 commit to main @ a1b2c3d (no squashing needed, no rebasing needed)
+
+* a1b2c3d (HEAD -> fix-auth) Implement JWT validation
+
+ auth.rs | 1 +
+ 1 file changed, 1 insertion(+)
+
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Cleaning up worktree...
+βœ… Returned to primary at ../repo/
# Shell back in main
```
@@ -113,7 +119,7 @@ worktree-path = "../{main-worktree}.{branch}"
[commit-generation]
command = "llm"
-args = ["-m", "claude-3-7-sonnet-20250219"]
+args = ["-m", "claude-haiku-4-5-20251001"]
```
Project config at `.config/wt.toml` in the repository root (see Project Automation above).
@@ -137,9 +143,6 @@ $ wt merge --no-squash
# Merge to a specific target branch
$ wt merge staging
-
-# Provide custom guidance
-$ wt merge -m "Focus on the authentication changes"
```
Set up LLM integration: `wt config help` shows the setup guide, `wt config init` creates example config.
@@ -279,6 +282,67 @@ Automate common tasks by creating `.config/wt.toml` in your repository root. Run
**Security:** Commands require approval on first run. Use `--force` to bypass.
+**Example output with hooks:**
+
+<!-- Output generated from: tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap -->
+
+```bash
+$ wt merge
+πŸ”„ Squashing 3 commits into 1 (3 files, +3)...
+πŸ”„ Generating squash commit message...
+ feat(auth): Implement JWT authentication system
+
+ Add comprehensive JWT token handling including validation, refresh logic,
+ and authentication tests. This establishes the foundation for secure
+ API authentication.
+
+ - Implement token refresh mechanism with expiry handling
+ - Add JWT encoding/decoding with signature verification
+ - Create test suite covering all authentication flows
+
+βœ… Squashed 3 commits into 1 @ a1b2c3d
+πŸ”„ Running pre-merge: lint
+ cargo clippy
+
+ Checking worktrunk v0.1.0
+ Finished dev [unoptimized + debuginfo] target(s) in 1.23s
+
+πŸ”„ Running pre-merge: test
+ cargo test
+
+ Finished test [unoptimized + debuginfo] target(s) in 0.12s
+ Running unittests src/lib.rs (target/debug/deps/worktrunk-abc123)
+
+running 18 tests
+test auth::tests::test_jwt_decode ... ok
+test auth::tests::test_jwt_encode ... ok
+test auth::tests::test_token_refresh ... ok
+test auth::tests::test_token_validation ... ok
+
+test result: ok. 18 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.08s
+
+πŸ”„ Merging 1 commit to main @ a1b2c3d (squashed from 3 commits, no rebasing needed)
+
+* a1b2c3d (HEAD -> feature-auth) feat(auth): Implement JWT authentication system
+
+ auth.rs | 1 +
+ auth_test.rs | 1 +
+ jwt.rs | 1 +
+ 3 files changed, 3 insertions(+)
+
+βœ… Merged to main (1 commit, 3 files, +3)
+πŸ”„ Cleaning up worktree...
+βœ… Returned to primary at ../repo/
+πŸ”„ Running post-merge: install
+ cargo install --path .
+
+ Installing worktrunk v0.1.0
+ Compiling worktrunk v0.1.0
+ Finished release [optimized] target(s) in 2.34s
+ Installing ~/.cargo/bin/wt
+ Installed package `worktrunk v0.1.0` (executable `wt`)
+```
+
</details>
### Worktree Paths
diff --git a/src/commands/dev.rs b/src/commands/dev.rs
index de8cbbe24..f417e37c7 100644
--- a/src/commands/dev.rs
+++ b/src/commands/dev.rs
@@ -149,12 +149,20 @@ pub fn handle_dev_commit(force: bool, no_verify: bool) -> Result<(), GitError> {
commit_with_generated_message("Committing changes...", &config.commit_generation)
}
+/// Information about what was squashed
+#[derive(Debug)]
+pub struct SquashInfo {
+ pub original_commit_count: usize,
+ pub had_staged_changes: bool,
+}
+
/// Handle `wt dev squash` command
+/// Returns Some(info) if squashing occurred, None if no squashing was needed
pub fn handle_dev_squash(
target: Option<&str>,
force: bool,
no_verify: bool,
-) -> Result<(), GitError> {
+) -> Result<Option<SquashInfo>, GitError> {
let repo = Repository::current();
let config = WorktrunkConfig::load().git_context("Failed to load config")?;
let current_branch = repo
@@ -195,21 +203,19 @@ pub fn handle_dev_squash(
crate::output::progress(format!(
"{dim}No commits to squash - already at merge base{dim:#}"
))?;
- return Ok(());
+ 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...", &config.commit_generation)?;
- return Ok(());
+ 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(());
+ // Don't show hint here - the merge message will indicate "no squashing needed"
+ return Ok(None);
}
// Either multiple commits OR single commit with staged changes - squash them
@@ -288,21 +294,37 @@ pub fn handle_dev_squash(
"{SUCCESS_EMOJI} {GREEN}Squashed {commit_count} commits into 1{GREEN:#} @ {HINT}{commit_hash}{HINT:#}"
))?;
- Ok(())
+ Ok(Some(SquashInfo {
+ original_commit_count: commit_count,
+ had_staged_changes: has_staged,
+ }))
}
/// 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")
+ super::worktree::handle_push(target, allow_merge_commits, "Pushed to", None, false)
}
/// Handle `wt dev rebase` command
-pub fn handle_dev_rebase(target: Option<&str>) -> Result<(), GitError> {
+/// Returns true if rebasing occurred, false if already up-to-date
+pub fn handle_dev_rebase(target: Option<&str>) -> Result<bool, GitError> {
let repo = Repository::current();
// Get target branch (default to default branch if not provided)
let target_branch = repo.resolve_target_branch(target)?;
+ // Check if already up-to-date
+ let merge_base = repo.merge_base("HEAD", &target_branch)?;
+ let target_sha = repo
+ .run_command(&["rev-parse", &target_branch])?
+ .trim()
+ .to_string();
+
+ if merge_base == target_sha {
+ // Already up-to-date, no rebase needed
+ return Ok(false);
+ }
+
// Rebase onto target
crate::output::progress(format!(
"πŸ”„ {CYAN}Rebasing onto {CYAN:#}{CYAN_BOLD}{target_branch}{CYAN_BOLD:#}{CYAN}...{CYAN:#}"
@@ -349,5 +371,5 @@ pub fn handle_dev_rebase(target: Option<&str>) -> Result<(), GitError> {
"{SUCCESS_EMOJI} {GREEN}Rebased onto {green_bold}{target_branch}{green_bold:#}{GREEN:#}"
))?;
- Ok(())
+ Ok(true)
}
diff --git a/src/commands/merge.rs b/src/commands/merge.rs
index 6403c7526..63b279ed7 100644
--- a/src/commands/merge.rs
+++ b/src/commands/merge.rs
@@ -119,15 +119,19 @@ pub fn handle_merge(
}
}
- // Squash commits if enabled
- if squash_enabled {
- handle_squash(&target_branch, no_verify, force)?;
- }
+ // Squash commits if enabled - track whether squashing occurred
+ let squash_info = if squash_enabled {
+ handle_squash(&target_branch, no_verify, force)?
+ } else {
+ None
+ };
- // Rebase onto target (skip if --no-commit)
- if !no_commit {
- super::dev::handle_dev_rebase(Some(&target_branch))?;
- }
+ // Rebase onto target (skip if --no-commit) - track whether rebasing occurred
+ let rebased = if !no_commit {
+ super::dev::handle_dev_rebase(Some(&target_branch))?
+ } else {
+ false
+ };
// Run pre-merge checks unless --no-verify was specified
// Do this after commit/squash/rebase to validate the final state that will be pushed
@@ -145,8 +149,14 @@ pub fn handle_merge(
)?;
}
- // Fast-forward push to target branch (reuse handle_push logic)
- handle_push(Some(&target_branch), false, "Merged to")?;
+ // Fast-forward push to target branch with squash/rebase info for consolidated message
+ handle_push(
+ Some(&target_branch),
+ false,
+ "Merged to",
+ squash_info.as_ref(),
+ rebased,
+ )?;
// Get primary worktree path before cleanup (while we can still run git commands)
let primary_worktree_dir = repo.main_worktree_root()?;
@@ -179,11 +189,9 @@ pub fn handle_merge(
.git_context("Failed to remove worktree")?;
// Print comprehensive summary
- crate::output::progress("")?;
handle_merge_summary_output(Some(&primary_worktree_dir))?;
} else {
// Print comprehensive summary (worktree preserved)
- crate::output::progress("")?;
handle_merge_summary_output(None)?;
}
@@ -373,10 +381,9 @@ fn handle_squash(
target_branch: &str,
no_verify: bool,
force: bool,
-) -> Result<Option<usize>, GitError> {
+) -> Result<Option<super::dev::SquashInfo>, GitError> {
// Delegate to the atomic dev command
- super::dev::handle_dev_squash(Some(target_branch), force, no_verify)?;
- Ok(None)
+ super::dev::handle_dev_squash(Some(target_branch), force, no_verify)
}
/// Run pre-merge commands sequentially (blocking, fail-fast)
diff --git a/src/commands/worktree.rs b/src/commands/worktree.rs
index bbbdddc05..92b4b1497 100644
--- a/src/commands/worktree.rs
+++ b/src/commands/worktree.rs
@@ -561,6 +561,8 @@ pub fn handle_push(
target: Option<&str>,
allow_merge_commits: bool,
verb: &str,
+ squash_info: Option<&super::dev::SquashInfo>,
+ rebased: bool,
) -> Result<(), GitError> {
let repo = Repository::current();
@@ -620,13 +622,14 @@ pub fn handle_push(
// Count commits and show what will be pushed
let commit_count = repo.count_commits(&target_branch, "HEAD")?;
- // Get diff statistics early so we can use them in the summary
+ // Get diff statistics BEFORE push (will be needed for success message later)
let diff_shortstat = if commit_count > 0 {
repo.run_command(&["diff", "--shortstat", &format!("{}..HEAD", target_branch)])?
} else {
String::new()
};
+ // Build and show consolidated message with squash/rebase info
if commit_count > 0 {
let commit_text = if commit_count == 1 {
"commit"
@@ -641,8 +644,40 @@ pub fn handle_push(
} else {
"Pushing"
};
+
+ // Build operation context based on what happened
+ let mut operations = Vec::new();
+
+ // Add squash info if applicable
+ if let Some(info) = squash_info {
+ let squash_text = if info.had_staged_changes {
+ if info.original_commit_count == 1 {
+ "combined 1 commit with working tree changes".to_string()
+ } else {
+ format!(
+ "squashed {} commits with working tree changes",
+ info.original_commit_count
+ )
+ }
+ } else {
+ format!("squashed from {} commits", info.original_commit_count)
+ };
+ operations.push(squash_text);
+ } else {
+ operations.push("no squashing needed".to_string());
+ }
+
+ // Add rebase info
+ if rebased {
+ operations.push("rebased".to_string());
+ } else {
+ operations.push("no rebasing needed".to_string());
+ }
+
+ let operations_text = operations.join(", ");
+
crate::output::progress(format!(
- "πŸ”„ {CYAN}{verb_ing} {commit_count} {commit_text} to {CYAN_BOLD}{target_branch}{CYAN_BOLD:#}{CYAN:#} @ {HINT}{head_sha}{HINT:#}\n"
+ "πŸ”„ {CYAN}{verb_ing} {commit_count} {commit_text} to {CYAN_BOLD}{target_branch}{CYAN_BOLD:#}{CYAN:#} @ {HINT}{head_sha}{HINT:#} ({operations_text})\n"
))?;
// Show the commit graph with color
@@ -682,9 +717,9 @@ pub fn handle_push(
error: e.to_string(),
})?;
- // Build success message with statistics
+ // Show success message after push completes
if commit_count > 0 {
- // Parse shortstat to extract files/insertions/deletions
+ // Use the diff statistics captured earlier (before push)
let stats = parse_diff_shortstat(&diff_shortstat);
let mut summary_parts = vec![format!(
diff --git a/src/main.rs b/src/main.rs
index 49eed1ee1..090de8e30 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -427,12 +427,12 @@ fn main() {
target,
force,
no_verify,
- } => handle_dev_squash(target.as_deref(), force, no_verify),
+ } => handle_dev_squash(target.as_deref(), force, no_verify).map(|_| ()),
DevCommand::Push {
target,
allow_merge_commits,
} => handle_dev_push(target.as_deref(), allow_merge_commits),
- DevCommand::Rebase { target } => handle_dev_rebase(target.as_deref()),
+ DevCommand::Rebase { target } => handle_dev_rebase(target.as_deref()).map(|_| ()),
},
Commands::List {
format,
diff --git a/tests/integration_tests/merge.rs b/tests/integration_tests/merge.rs
index 47fef2e17..ce29b2e37 100644
--- a/tests/integration_tests/merge.rs
+++ b/tests/integration_tests/merge.rs
@@ -1678,6 +1678,250 @@ fn test_merge_no_remote() {
snapshot_merge("merge_no_remote", &repo, &[], Some(&feature_wt));
}
+// README EXAMPLE GENERATION TESTS
+// These tests are specifically designed to generate realistic output examples for the README.
+// The snapshots from these tests are manually copied into README.md to show users what
+// worktrunk output looks like in practice.
+
+/// Generate README example: Simple merge workflow with a single commit
+/// This demonstrates the basic "What It Does" flow - create worktree, make changes, merge back.
+///
+/// Output is used in README.md "What It Does" section.
+/// Source: tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
+#[test]
+fn test_readme_example_simple() {
+ let mut repo = TestRepo::new();
+ repo.commit("Initial commit");
+ repo.setup_remote("main");
+
+ // Create a worktree for main
+ let main_wt = repo.root_path().parent().unwrap().join("test-repo.main-wt");
+ let mut cmd = Command::new("git");
+ repo.configure_git_cmd(&mut cmd);
+ cmd.args(["worktree", "add", main_wt.to_str().unwrap(), "main"])
+ .current_dir(repo.root_path())
+ .output()
+ .expect("Failed to add worktree");
+
+ // Create a fix-auth worktree and make a commit
+ let feature_wt = repo.add_worktree("fix-auth", "fix-auth");
+ std::fs::write(feature_wt.join("auth.rs"), "// JWT validation code")
+ .expect("Failed to write file");
+
+ let mut cmd = Command::new("git");
+ repo.configure_git_cmd(&mut cmd);
+ cmd.args(["add", "auth.rs"])
+ .current_dir(&feature_wt)
+ .output()
+ .expect("Failed to add file");
+
+ let mut cmd = Command::new("git");
+ repo.configure_git_cmd(&mut cmd);
+ cmd.args(["commit", "-m", "Implement JWT validation"])
+ .current_dir(&feature_wt)
+ .output()
+ .expect("Failed to commit");
+
+ // Merge fix-auth into main
+ snapshot_merge("readme_example_simple", &repo, &["main"], Some(&feature_wt));
+}
+
+/// Generate README example: Complex merge with multiple hooks
+/// This demonstrates advanced features - pre-merge hooks (tests, lints), post-merge hooks.
+/// Shows the full power of worktrunk's automation capabilities.
+///
+/// Output is used in README.md "Advanced Features" or "Project Automation" section.
+/// Source: tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
+#[test]
+fn test_readme_example_complex() {
+ let mut repo = TestRepo::new();
+ repo.commit("Initial commit");
+ repo.setup_remote("main");
+
+ // Create project config with multiple hooks
+ let config_dir = repo.root_path().join(".config");
+ fs::create_dir_all(&config_dir).expect("Failed to create .config dir");
+
+ // Create mock commands for realistic output
+ let bin_dir = repo.root_path().join(".bin");
+ fs::create_dir_all(&bin_dir).expect("Failed to create bin dir");
+
+ // Mock cargo that handles both test and clippy subcommands
+ let cargo_script = r#"#!/bin/sh
+if [ "$1" = "test" ]; then
+ echo " Finished test [unoptimized + debuginfo] target(s) in 0.12s"
+ echo " Running unittests src/lib.rs (target/debug/deps/worktrunk-abc123)"
+ echo ""
+ echo "running 18 tests"
+ echo "test auth::tests::test_jwt_decode ... ok"
+ echo "test auth::tests::test_jwt_encode ... ok"
+ echo "test auth::tests::test_token_refresh ... ok"
+ echo "test auth::tests::test_token_validation ... ok"
+ echo ""
+ echo "test result: ok. 18 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.08s"
+ exit 0
+elif [ "$1" = "clippy" ]; then
+ echo " Checking worktrunk v0.1.0"
+ echo " Finished dev [unoptimized + debuginfo] target(s) in 1.23s"
+ exit 0
+elif [ "$1" = "install" ]; then
+ echo " Installing worktrunk v0.1.0"
+ echo " Compiling worktrunk v0.1.0"
+ echo " Finished release [optimized] target(s) in 2.34s"
+ echo " Installing ~/.cargo/bin/wt"
+ echo " Installed package \`worktrunk v0.1.0\` (executable \`wt\`)"
+ exit 0
+else
+ echo "cargo: unknown subcommand '$1'"
+ exit 1
+fi
+"#;
+ fs::write(bin_dir.join("cargo"), cargo_script).expect("Failed to write cargo script");
+
+ // Mock llm command that generates a high-quality commit message
+ let llm_script = r#"#!/bin/sh
+# Read stdin (the prompt) but ignore it for deterministic output
+cat > /dev/null
+
+# Return a realistic, high-quality squash commit message
+cat << 'EOF'
+feat(auth): Implement JWT authentication system
+
+Add comprehensive JWT token handling including validation, refresh logic,
+and authentication tests. This establishes the foundation for secure
+API authentication.
+
+- Implement token refresh mechanism with expiry handling
+- Add JWT encoding/decoding with signature verification
+- Create test suite covering all authentication flows
+EOF
+"#;
+ fs::write(bin_dir.join("llm"), llm_script).expect("Failed to write llm script");
+
+ // Make scripts executable
+ #[cfg(unix)]
+ {
+ use std::os::unix::fs::PermissionsExt;
+ let mut perms = fs::metadata(bin_dir.join("cargo")).unwrap().permissions();
+ perms.set_mode(0o755);
+ fs::set_permissions(bin_dir.join("cargo"), perms).unwrap();
+
+ let mut perms = fs::metadata(bin_dir.join("llm")).unwrap().permissions();
+ perms.set_mode(0o755);
+ fs::set_permissions(bin_dir.join("llm"), perms).unwrap();
+ }
+
+ let config_content = r#"
+[pre-merge-command]
+"test" = "cargo test"
+"lint" = "cargo clippy"
+
+[post-merge-command]
+"install" = "cargo install --path ."
+"#;
+
+ fs::write(config_dir.join("wt.toml"), config_content).expect("Failed to write project config");
+
+ // Commit the config and mock cargo
+ let mut cmd = Command::new("git");
+ repo.configure_git_cmd(&mut cmd);
+ cmd.args(["add", ".config/wt.toml", ".bin"])
+ .current_dir(repo.root_path())
+ .output()
+ .expect("Failed to add config");
+
+ let mut cmd = Command::new("git");
+ repo.configure_git_cmd(&mut cmd);
+ cmd.args(["commit", "-m", "Add project automation config"])
+ .current_dir(repo.root_path())
+ .output()
+ .expect("Failed to commit config");
+
+ // Create a worktree for main
+ let main_wt = repo.root_path().parent().unwrap().join("test-repo.main-wt");
+ let mut cmd = Command::new("git");
+ repo.configure_git_cmd(&mut cmd);
+ cmd.args(["worktree", "add", main_wt.to_str().unwrap(), "main"])
+ .current_dir(repo.root_path())
+ .output()
+ .expect("Failed to add worktree");
+
+ // Create a feature worktree and make multiple commits
+ let feature_wt = repo.add_worktree("feature-auth", "feature-auth");
+
+ // First commit: token refresh
+ std::fs::write(feature_wt.join("auth.rs"), "// Token refresh logic\n")
+ .expect("Failed to write file");
+ let mut cmd = Command::new("git");
+ repo.configure_git_cmd(&mut cmd);
+ cmd.args(["add", "auth.rs"])
+ .current_dir(&feature_wt)
+ .output()
+ .expect("Failed to add file");
+ let mut cmd = Command::new("git");
+ repo.configure_git_cmd(&mut cmd);
+ cmd.args(["commit", "-m", "Add token refresh logic"])
+ .current_dir(&feature_wt)
+ .output()
+ .expect("Failed to commit");
+
+ // Second commit: JWT validation
+ std::fs::write(feature_wt.join("jwt.rs"), "// JWT validation\n").expect("Failed to write file");
+ let mut cmd = Command::new("git");
+ repo.configure_git_cmd(&mut cmd);
+ cmd.args(["add", "jwt.rs"])
+ .current_dir(&feature_wt)
+ .output()
+ .expect("Failed to add file");
+ let mut cmd = Command::new("git");
+ repo.configure_git_cmd(&mut cmd);
+ cmd.args(["commit", "-m", "Implement JWT validation"])
+ .current_dir(&feature_wt)
+ .output()
+ .expect("Failed to commit");
+
+ // Third commit: tests
+ std::fs::write(feature_wt.join("auth_test.rs"), "// Tests\n").expect("Failed to write file");
+ let mut cmd = Command::new("git");
+ repo.configure_git_cmd(&mut cmd);
+ cmd.args(["add", "auth_test.rs"])
+ .current_dir(&feature_wt)
+ .output()
+ .expect("Failed to add file");
+ let mut cmd = Command::new("git");
+ repo.configure_git_cmd(&mut cmd);
+ cmd.args(["commit", "-m", "Add authentication tests"])
+ .current_dir(&feature_wt)
+ .output()
+ .expect("Failed to commit");
+
+ // Configure LLM in worktrunk config for deterministic, high-quality commit messages
+ let llm_path = bin_dir.join("llm");
+ let worktrunk_config = format!(
+ r#"
+[commit-generation]
+command = "{}"
+"#,
+ llm_path.display()
+ );
+ fs::write(repo.test_config_path(), worktrunk_config).expect("Failed to write worktrunk config");
+
+ // Merge with --force to skip approval prompts for commands
+ // Set PATH to include .bin directory so mock cargo command is found
+ let path_with_bin = format!(
+ "{}:{}",
+ bin_dir.display(),
+ std::env::var("PATH").unwrap_or_default()
+ );
+ snapshot_merge_with_env(
+ "readme_example_complex",
+ &repo,
+ &["main", "--force"],
+ Some(&feature_wt),
+ &[("PATH", &path_with_bin)],
+ );
+}
+
#[test]
fn test_merge_no_commit_with_clean_tree() {
let mut repo = TestRepo::new();
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.snap
index 7c83646d0..0678dd9c9 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
@@ -2,8 +2,6 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized().as_ref()
---
-πŸ”„ Rebasing onto main...
-βœ… Rebased onto main
πŸ”„ Running pre-merge: format
  echo 'βœ“ 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.snap
index fb3a7bd64..f89601af5 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
@@ -2,8 +2,6 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized().as_ref()
---
-πŸ”„ Rebasing onto main...
-βœ… Rebased onto main
πŸ”„ Running pre-merge: format
  echo 'βœ“ 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.snap
index 5176685aa..e027d7773 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
@@ -9,8 +9,6 @@ expression: output.normalized().as_ref()
Command failed with exit code: exit status: 1
πŸ’‘ Use --no-hooks to skip pre-merge commands
-πŸ”„ Rebasing onto main...
-βœ… Rebased onto main
πŸ”„ Running pre-merge: format
  echo 'βœ“ 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.snap
index 4b9b85053..1c922d9a7 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
@@ -2,8 +2,6 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized().as_ref()
---
-πŸ”„ Rebasing onto main...
-βœ… Rebased onto main
πŸ”„ Running pre-merge: format
  echo 'βœ“ Code formatting check passed'
@@ -19,7 +17,7 @@ expression: output.normalized().as_ref()
βœ“ All 47 tests passed in 2.3s
-πŸ”„ Merging 1 commit to main @ d067f01
+πŸ”„ Merging 1 commit to main @ d067f01 (no squashing needed, no rebasing needed)
* d067f01 (HEAD -> feature) Add feature
@@ -28,5 +26,4 @@ expression: output.normalized().as_ref()
βœ… Merged to main (1 commit, 1 file, +1) 
πŸ”„ Cleaning up worktree...
-
βœ… Returned to primary at [TMPDIR]/test-repo
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.snap
index 656ba1c6f..4b11764a3 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
@@ -1,10 +1,7 @@
---
source: tests/integration_tests/shell_wrapper.rs
-assertion_line: 637
expression: output.normalized().as_ref()
---
-πŸ”„ Rebasing onto main...
-βœ… Rebased onto main
πŸ”„ Running pre-merge: format
  echo 'βœ“ Code formatting check passed'
@@ -17,7 +14,7 @@ expression: output.normalized().as_ref()
  echo 'βœ“ All 47 tests passed in 2.3s'
βœ“ All 47 tests passed in 2.3s
-πŸ”„ Merging 1 commit to main @ d067f01
+πŸ”„ Merging 1 commit to main @ d067f01 (no squashing needed, no rebasing needed)
* d067f01 (HEAD -> feature) Add feature
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.snap
index 945d9b978..7034c6c0d 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
@@ -5,8 +5,6 @@ expression: output.normalized().as_ref()
βœ“ Code formatting check passed
βœ“ Linting passed - no warnings
βœ“ All 47 tests passed in 2.3s
-πŸ”„ Rebasing onto main...
-βœ… Rebased onto main
πŸ”„ Running pre-merge: format
  echo 'βœ“ Code formatting check passed'
@@ -19,7 +17,7 @@ expression: output.normalized().as_ref()
  echo 'βœ“ All 47 tests passed in 2.3s'
-πŸ”„ Merging 1 commit to main @ d067f01
+πŸ”„ Merging 1 commit to main @ d067f01 (no squashing needed, no rebasing needed)
* d067f01 (HEAD -> feature) Add feature
@@ -28,5 +26,4 @@ expression: output.normalized().as_ref()
βœ… Merged to main (1 commit, 1 file, +1) 
πŸ”„ Cleaning up worktree...
-
βœ… Returned to primary at [TMPDIR]/test-repo
diff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap
index 4375d1831..7a42f82b3 100644
Binary files a/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap and b/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap differ
diff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap
index 839d2022b..ebabef9fb 100644
Binary files a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap and b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap differ
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap
index 075df36dc..4a58aac45 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/.tmppsiALg/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpbRZNig/test-config.toml
---
success: true
exit_code: 0
@@ -33,9 +33,7 @@ exit_code: 0
  - feat: add file 2
βœ… Squashed 2 commits into 1 @ [SHA]
-πŸ”„ Rebasing onto main...
-βœ… Rebased onto main
-πŸ”„ Merging 1 commit to main @ [SHA]
+πŸ”„ Merging 1 commit to main @ [SHA] (squashed 2 commits with working tree changes, no rebasing needed)
* [SHA] (HEAD -> feature) Squash commits from main
@@ -45,7 +43,6 @@ exit_code: 0
βœ… Merged to main (1 commit, 2 files, +2) 
πŸ”„ Cleaning up worktree...
-
βœ… Returned to primary at [REPO]
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap
index c2ab6be6f..75edf874d 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: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpGXOLHR/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpwV1dK4/test-config.toml
---
success: true
exit_code: 0
@@ -30,9 +30,7 @@ exit_code: 0
  - feat: initial feature
βœ… Squashed 1 commits into 1 @ [SHA]
-πŸ”„ Rebasing onto main...
-βœ… Rebased onto main
-πŸ”„ Merging 1 commit to main @ [SHA]
+πŸ”„ Merging 1 commit to main @ [SHA] (combined 1 commit with working tree changes, no rebasing needed)
* [SHA] (HEAD -> feature) Squash commits from main
@@ -41,7 +39,6 @@ exit_code: 0
βœ… Merged to main (1 commit, 1 file, +1) 
πŸ”„ Cleaning up worktree...
-
βœ… Returned to primary at [REPO]
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap
index c3d8b3781..afff012a0 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/.tmpa0yrih/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpGN5GCo/test-config.toml
---
success: true
exit_code: 0
@@ -32,9 +32,7 @@ exit_code: 0
  - feat: add authentication
βœ… Squashed 1 commits into 1 @ [SHA]
-πŸ”„ Rebasing onto main...
-βœ… Rebased onto main
-πŸ”„ Merging 1 commit to main @ [SHA]
+πŸ”„ Merging 1 commit to main @ [SHA] (combined 1 commit with working tree changes, no rebasing needed)
* [SHA] (HEAD -> feature) Squash commits from main
@@ -43,7 +41,6 @@ exit_code: 0
βœ… Merged to main (1 commit, 1 file, +1) 
πŸ”„ Cleaning up worktree...
-
βœ… Returned to primary at [REPO]
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap b/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap
index 1d3ad6ca7..ad892d875 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: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpK8i1Lp/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpCdihbf/test-config.toml
---
success: true
exit_code: 0
@@ -28,9 +28,7 @@ exit_code: 0
  WIP: Auto-commit before merge
βœ… Committed changes @ [SHA]
-πŸ”„ Rebasing onto main...
-βœ… Rebased onto main
-πŸ”„ Merging 1 commit to main @ [SHA]
+πŸ”„ Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) WIP: Auto-commit before merge
@@ -39,7 +37,6 @@ exit_code: 0
βœ… Merged to main (1 commit, 1 file, +1) 
πŸ”„ Cleaning up worktree...
-
βœ… Returned to primary at [REPO]
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
index 4ca894ba6..329149824 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
@@ -16,15 +16,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpw1pT9Z/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpM8kqV3/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ’‘ Only 1 commit since main - no squashing needed
-πŸ”„ Rebasing onto main...
-βœ… Rebased onto main
-πŸ”„ Merging 1 commit to main @ [SHA]
+πŸ”„ Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file
@@ -33,7 +30,6 @@ exit_code: 0
βœ… Merged to main (1 commit, 1 file, +1) 
πŸ”„ Cleaning up worktree...
-
βœ… Returned to primary at [REPO]
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
index fdd5f07c5..168116cb6 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
@@ -17,14 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpNxX0fb/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpBjZeiA/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Rebasing onto main...
-βœ… Rebased onto main
-πŸ”„ Merging 2 commits to main @ [SHA]
+πŸ”„ Merging 2 commits to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) feat: add file 2
* [SHA] feat: add file 1
@@ -35,7 +33,6 @@ exit_code: 0
βœ… Merged to main (2 commits, 2 files, +2) 
πŸ”„ Cleaning up worktree...
-
βœ… Returned to primary at [REPO]
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap
index 8bb7e9b3f..901a9a0a4 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,15 +16,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpPjP2Oj/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpItpg0I/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ’‘ Only 1 commit since main - no squashing needed
-πŸ”„ Rebasing onto main...
-βœ… Rebased onto main
-πŸ”„ Merging 1 commit to main @ [SHA]
+πŸ”„ Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file
@@ -33,7 +30,6 @@ exit_code: 0
βœ… Merged to main (1 commit, 1 file, +1) 
πŸ”„ Cleaning up worktree...
-
βœ… Returned to primary at [REPO]
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap
index 0e41e9ba8..5f938f8de 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,15 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpptr827/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp1r8BDX/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ’‘ Only 1 commit since main - no squashing needed
-πŸ”„ Rebasing onto main...
-βœ… Rebased onto main
-πŸ”„ Merging 1 commit to main @ [SHA]
+πŸ”„ Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file
@@ -34,7 +31,6 @@ exit_code: 0
βœ… Merged to main (1 commit, 1 file, +1) 
πŸ”„ Cleaning up worktree...
-
βœ… Returned to primary at [REPO]
πŸ”„ Running post-merge:
  exit 1
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap
index e8add9023..c5324285f 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,15 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpGWnwYn/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVp30eA/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ’‘ Only 1 commit since main - no squashing needed
-πŸ”„ Rebasing onto main...
-βœ… Rebased onto main
-πŸ”„ Merging 1 commit to main @ [SHA]
+πŸ”„ Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file
@@ -34,7 +31,6 @@ exit_code: 0
βœ… Merged to main (1 commit, 1 file, +1) 
πŸ”„ Cleaning up worktree...
-
βœ… Returned to primary at [REPO]
πŸ”„ Running post-merge: deploy
  echo 'Deploying branch feature' > deploy.txt
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap
index 72829052e..140a6e191 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,15 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKEEEAG/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp961yHP/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ’‘ Only 1 commit since main - no squashing needed
-πŸ”„ Rebasing onto main...
-βœ… Rebased onto main
-πŸ”„ Merging 1 commit to main @ [SHA]
+πŸ”„ Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file
@@ -34,7 +31,6 @@ exit_code: 0
βœ… Merged to main (1 commit, 1 file, +1) 
πŸ”„ Cleaning up worktree...
-
βœ… Returned to primary at [REPO]
πŸ”„ Running post-merge:
  echo 'merged feature to main' > post-merge-ran.txt
diff --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.snap
index eb81a6524..64985206d 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
@@ -3,9 +3,6 @@ source: tests/integration_tests/merge.rs
expression: output
---
Exit code: 0
-πŸ’‘ Only 1 commit since main - no squashing needed
-πŸ”„ Rebasing onto main...
-βœ… Rebased onto main
πŸ”„ Running pre-merge: first
  echo 'STDOUT-FROM-FIRST' && echo 'STDERR-FROM-FIRST' >&2
@@ -16,7 +13,7 @@ STDERR-FROM-FIRST
STDOUT-FROM-SECOND
STDERR-FROM-SECOND
-πŸ”„ Merging 1 commit to main @ [SHA]
+πŸ”„ Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file
@@ -25,5 +22,4 @@ STDERR-FROM-SECOND
βœ… Merged to main (1 commit, 1 file, +1) 
πŸ”„ Cleaning up worktree...
-
βœ… Returned to primary at [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap
index 04fff9ee8..4abf61de8 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,14 +17,11 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp9HHF8C/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpNbIRqv/test-config.toml
---
success: false
exit_code: 1
----- stdout -----
-πŸ’‘ Only 1 commit since main - no squashing needed
-πŸ”„ Rebasing onto main...
-βœ… Rebased onto main
πŸ”„ Running pre-merge:
  exit 1
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap
index 59d473dc3..03d5fb91b 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,14 +17,11 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpibRGV7/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0RRBRD/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ’‘ Only 1 commit since main - no squashing needed
-πŸ”„ Rebasing onto main...
-βœ… Rebased onto main
πŸ”„ Running pre-merge: format
  exit 0
@@ -34,7 +31,7 @@ exit_code: 0
πŸ”„ Running pre-merge: test
  exit 0
-πŸ”„ Merging 1 commit to main @ [SHA]
+πŸ”„ Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file
@@ -43,7 +40,6 @@ exit_code: 0
βœ… Merged to main (1 commit, 1 file, +1) 
πŸ”„ Cleaning up worktree...
-
βœ… Returned to primary at [REPO]
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap
index b25a7da92..e0521b626 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,21 +17,18 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVzGbNN/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJT7T2l/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ’‘ Only 1 commit since main - no squashing needed
-πŸ”„ Rebasing onto main...
-βœ… Rebased onto main
πŸ”„ Running pre-merge: check1
  [PROJECT_ROOT]/tests/fixtures/mixed-output.sh check1 3
πŸ”„ Running pre-merge: check2
  [PROJECT_ROOT]/tests/fixtures/mixed-output.sh check2 3
-πŸ”„ Merging 1 commit to main @ [SHA]
+πŸ”„ Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file
@@ -40,7 +37,6 @@ exit_code: 0
βœ… Merged to main (1 commit, 1 file, +1) 
πŸ”„ Cleaning up worktree...
-
βœ… Returned to primary at [REPO]
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap
index e7127994e..0519586f1 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,18 +17,15 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp6PQ8BW/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5C34Tk/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ’‘ Only 1 commit since main - no squashing needed
-πŸ”„ Rebasing onto main...
-βœ… Rebased onto main
πŸ”„ Running pre-merge:
  exit 0
-πŸ”„ Merging 1 commit to main @ [SHA]
+πŸ”„ Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file
@@ -37,7 +34,6 @@ exit_code: 0
βœ… Merged to main (1 commit, 1 file, +1) 
πŸ”„ Cleaning up worktree...
-
βœ… Returned to primary at [REPO]
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap
index 3cf090880..da1c29486 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap
@@ -16,12 +16,11 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpr5RlUa/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp6cpPcZ/test-config.toml
---
success: false
exit_code: 1
----- stdout -----
-πŸ’‘ Only 1 commit since main - no squashing needed
πŸ”„ Rebasing onto main...
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
index ec92bea12..6d5535645 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: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmppEnM0q/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpufA4BS/test-config.toml
---
success: true
exit_code: 0
@@ -32,9 +32,7 @@ exit_code: 0
  - docs: update readme
βœ… Squashed 3 commits into 1 @ [SHA]
-πŸ”„ Rebasing onto main...
-βœ… Rebased onto main
-πŸ”„ Merging 1 commit to main @ [SHA]
+πŸ”„ Merging 1 commit to main @ [SHA] (squashed from 3 commits, no rebasing needed)
* [SHA] (HEAD -> feature) Squash commits from main
@@ -45,7 +43,6 @@ exit_code: 0
βœ… Merged to main (1 commit, 3 files, +3) 
πŸ”„ Cleaning up worktree...
-
βœ… Returned to primary at [REPO]
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap
index 4a2cc3918..e5db4e74e 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: C
SOURCE_DATE_EPOCH: "1761609600"
WORKTRUNK_COMMIT_GENERATION__COMMAND: nonexistent-llm-command
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZXmgNV/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQJT4pD/test-config.toml
---
success: true
exit_code: 0
@@ -32,9 +32,7 @@ exit_code: 0
  - fix: bug fix
βœ… Squashed 2 commits into 1 @ [SHA]
-πŸ”„ Rebasing onto main...
-βœ… Rebased onto main
-πŸ”„ Merging 1 commit to main @ [SHA]
+πŸ”„ Merging 1 commit to main @ [SHA] (squashed from 2 commits, no rebasing needed)
* [SHA] (HEAD -> feature) Squash commits from main
@@ -44,7 +42,6 @@ exit_code: 0
βœ… Merged to main (1 commit, 2 files, +2) 
πŸ”„ Cleaning up worktree...
-
βœ… Returned to primary at [REPO]
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap
index 2cad18722..f1c97e921 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,15 +16,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpn7WcLT/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmphdi9En/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ’‘ Only 1 commit since main - no squashing needed
-πŸ”„ Rebasing onto main...
-βœ… Rebased onto main
-πŸ”„ Merging 1 commit to main @ [SHA]
+πŸ”„ Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) feat: single commit
@@ -33,7 +30,6 @@ exit_code: 0
βœ… Merged to main (1 commit, 1 file, +1) 
πŸ”„ Cleaning up worktree...
-
βœ… Returned to primary at [REPO]
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap
index 7a3c73289..344278e28 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/.tmpkJlhWQ/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpruk401/test-config.toml
---
success: true
exit_code: 0
@@ -34,9 +34,7 @@ exit_code: 0
  - fix: handle edge case
βœ… Squashed 2 commits into 1 @ [SHA]
-πŸ”„ Rebasing onto main...
-βœ… Rebased onto main
-πŸ”„ Merging 1 commit to main @ [SHA]
+πŸ”„ Merging 1 commit to main @ [SHA] (squashed from 2 commits, no rebasing needed)
* [SHA] (HEAD -> feature) Squash commits from main
@@ -45,7 +43,6 @@ exit_code: 0
βœ… Merged to main (1 commit, 1 file, +1) 
πŸ”„ Cleaning up worktree...
-
βœ… Returned to primary at [REPO]
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
index c499f9ad3..9bc71d6c4 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
@@ -15,15 +15,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp3UD0bD/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0fiW6U/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ’‘ Only 1 commit since main - no squashing needed
-πŸ”„ Rebasing onto main...
-βœ… Rebased onto main
-πŸ”„ Merging 1 commit to main @ [SHA]
+πŸ”„ Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file
@@ -32,7 +29,6 @@ exit_code: 0
βœ… Merged to main (1 commit, 1 file, +1) 
πŸ”„ Cleaning up worktree...
-
βœ… Returned to primary at [REPO]
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap
index ee0448d3b..d17575ba1 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap
@@ -17,15 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpS90eIp/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpM2oDVY/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ’‘ Only 1 commit since main - no squashing needed
-πŸ”„ Rebasing onto main...
-βœ… Rebased onto main
-πŸ”„ Merging 1 commit to main @ [SHA]
+πŸ”„ Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file
@@ -33,7 +30,6 @@ exit_code: 0
1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1) 
-
βœ… Kept worktree (use 'wt remove' to clean up)
----- stderr -----
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.snap
index f4410cec7..c8a62261d 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/.tmpbltNyI/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpAni2oA/test-config.toml
---
success: true
exit_code: 0
@@ -33,9 +33,7 @@ exit_code: 0
  - feat: add file 1
βœ… Squashed 1 commits into 1 @ [SHA]
-πŸ”„ Rebasing onto main...
-βœ… Rebased onto main
-πŸ”„ Merging 1 commit to main @ [SHA]
+πŸ”„ Merging 1 commit to main @ [SHA] (combined 1 commit with working tree changes, no rebasing needed)
* [SHA] (HEAD -> feature) Squash commits from main
@@ -46,7 +44,6 @@ exit_code: 0
βœ… Merged to main (1 commit, 3 files, +3) 
πŸ”„ Cleaning up worktree...
-
βœ… Returned to primary at [REPO]
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
new file mode 100644
index 000000000..a2f60599b
--- /dev/null
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
@@ -0,0 +1,78 @@
+---
+source: tests/integration_tests/merge.rs
+info:
+ program: wt
+ args:
+ - merge
+ - main
+ - "--force"
+ env:
+ CLICOLOR_FORCE: "1"
+ COLUMNS: "150"
+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_SYSTEM: /dev/null
+ GIT_EDITOR: ""
+ LANG: C
+ LC_ALL: C
+ PATH: "/private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpcj8v04/test-repo/.bin:/Users/maximilian/.cargo/bin:/Users/maximilian/.local/bin:/Users/maximilian/.bun/bin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
+ SOURCE_DATE_EPOCH: "1761609600"
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpcj8v04/test-config.toml
+---
+success: true
+exit_code: 0
+----- stdout -----
+πŸ”„ Squashing 3 commits into 1 (3 files, +3)...
+πŸ”„ Generating squash commit message...
+  feat(auth): Implement JWT authentication system
+ 
+  Add comprehensive JWT token handling including validation, refresh logic,
+  and authentication tests. This establishes the foundation for secure
+  API authentication.
+ 
+  - Implement token refresh mechanism with expiry handling
+  - Add JWT encoding/decoding with signature verification
+  - Create test suite covering all authentication flows
+
+βœ… Squashed 3 commits into 1 @ [SHA]
+πŸ”„ Running pre-merge: lint
+  cargo clippy
+
+πŸ”„ Running pre-merge: test
+  cargo test
+
+πŸ”„ Merging 1 commit to main @ [SHA] (squashed from 3 commits, no rebasing needed)
+
+* [SHA] (HEAD -> feature-auth) feat(auth): Implement JWT authentication system
+
+ auth.rs | 1 +
+ auth_test.rs | 1 +
+ jwt.rs | 1 +
+ 3 files changed, 3 insertions(+)
+
+βœ… Merged to main (1 commit, 3 files, +3) 
+πŸ”„ Cleaning up worktree...
+βœ… Returned to primary at [REPO]
+πŸ”„ Running post-merge: install
+  cargo install --path .
+
+
+----- stderr -----
+ Checking worktrunk v0.1.0
+ Finished dev [unoptimized + debuginfo] target(s) in 1.23s
+ Finished test [unoptimized + debuginfo] target(s) in 0.12s
+ Running unittests src/lib.rs (target/debug/deps/worktrunk-abc123)
+
+running 18 tests
+test auth::tests::test_jwt_decode ... ok
+test auth::tests::test_jwt_encode ... ok
+test auth::tests::test_token_refresh ... ok
+test auth::tests::test_token_validation ... ok
+
+test result: ok. 18 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.08s
+ Installing worktrunk v0.1.0
+ Compiling worktrunk v0.1.0
+ Finished release [optimized] target(s) in 2.34s
+ Installing ~/.cargo/bin/wt
+ Installed package `worktrunk v0.1.0` (executable `wt`)
diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
new file mode 100644
index 000000000..9bb73a5b8
--- /dev/null
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
@@ -0,0 +1,35 @@
+---
+source: tests/integration_tests/merge.rs
+info:
+ program: wt
+ args:
+ - merge
+ - main
+ env:
+ CLICOLOR_FORCE: "1"
+ COLUMNS: "150"
+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_CONFIG_GLOBAL: /dev/null
+ GIT_CONFIG_SYSTEM: /dev/null
+ GIT_EDITOR: ""
+ LANG: C
+ LC_ALL: C
+ SOURCE_DATE_EPOCH: "1761609600"
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp3FpSM5/test-config.toml
+---
+success: true
+exit_code: 0
+----- stdout -----
+πŸ”„ Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+
+* [SHA] (HEAD -> fix-auth) Implement JWT validation
+
+ auth.rs | 1 +
+ 1 file changed, 1 insertion(+)
+
+βœ… Merged to main (1 commit, 1 file, +1) 
+πŸ”„ Cleaning up worktree...
+βœ… Returned to primary at [REPO]
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap
index abdc7807a..5b8ab238b 100644
--- a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap
@@ -16,12 +16,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmprzvDes/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp4ShPso/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Pushing 1 commit to main @ [SHA]
+πŸ”„ Pushing 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add test file
diff --git a/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap
index ac540c37e..10af99ee0 100644
--- a/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap
@@ -16,12 +16,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0RHF3w/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpwYqsRl/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Pushing 1 commit to main @ [SHA]
+πŸ”„ Pushing 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file
diff --git a/tests/snapshots/integration__integration_tests__push__push_to_default.snap b/tests/snapshots/integration__integration_tests__push__push_to_default.snap
index 937345cf7..a70154357 100644
--- a/tests/snapshots/integration__integration_tests__push__push_to_default.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_to_default.snap
@@ -15,12 +15,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpIMg60w/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpP2HXWU/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Pushing 1 commit to main @ [SHA]
+πŸ”„ Pushing 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file