Skip to content

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

Refactor symbol styling in remove/merge messages (#260)

Maximilian Roos5c208238a34f
diff --git a/.claude/rules/cli-output-formatting.md b/.claude/rules/cli-output-formatting.md
index 5d3d2f630..c3195e56c 100644
--- a/.claude/rules/cli-output-formatting.md
+++ b/.claude/rules/cli-output-formatting.md
@@ -41,6 +41,25 @@ information, not restate what's already said.
"Committing with default message... (3 files, +45, -12)"
```
+**Two types of parenthesized content with different styling:**
+
+1. **Stats parentheses → Gray** (`[90m` bright-black): Supplementary numerical
+ info that could be omitted without losing meaning.
+ ```
+ ✅ Merged to main (1 commit, 1 file, +1)
+ 🔄 Squashing 2 commits into a single commit (2 files, +2)...
+ ```
+
+2. **Reason parentheses → Message color**: Explains WHY an action is happening;
+ integral to understanding.
+ ```
+ 🔄 Removing feature worktree & branch in background (same commit as main, _)
+ ```
+
+Stats are truly optional context. Reasons answer "why is this safe/happening?"
+and belong with the main message. Symbols within reason parentheses still render
+in their native styling (see "Symbol styling" below).
+
**Avoid pronouns with cross-message referents:** Hints appear as separate
messages from errors. Don't use pronouns like "it" that refer to something
mentioned in the error message.
@@ -99,17 +118,17 @@ behavior:
"Removing feature worktree in background; retaining branch (--no-delete-branch)" // User flag (user keeps)
```
-**Symbol styling:** Status symbols should use their standard styling consistently
-across all contexts (messages, tables, etc.). Each symbol has a defined
-appearance:
+**Symbol styling:** Symbols are atomic with their color — the styling is part of
+the symbol's identity, not a presentation choice. Each symbol has a defined
+appearance that must be preserved in all contexts:
- `_` and `⊂` — dim (integration/safe-to-delete indicators)
-- Other symbols may have colors (e.g., diff indicators)
+- `+N` and `-N` — green/red (diff indicators)
-Symbols should match their `wt list` appearance when referenced in messages.
-When a symbol appears in a progress/success message, ensure the message's color
-(e.g., cyan for progress) is closed BEFORE the symbol so the symbol renders in
-its standard styling, not tinted by the message color.
+When a symbol appears in a colored message (cyan progress, green success), close
+the message color before the symbol so it renders in its native styling. This
+requires breaking out of the message color and reopening it after the symbol.
+See `FlagNote` in `src/output/handlers.rs` for the implementation pattern.
**Comma + "but" + em-dash for limitations:** When stating an outcome with a
limitation and its reason:
diff --git a/src/output/handlers.rs b/src/output/handlers.rs
index 7845b1c33..38b58909e 100644
--- a/src/output/handlers.rs
+++ b/src/output/handlers.rs
@@ -15,8 +15,9 @@ use worktrunk::git::path_dir_name;
use worktrunk::path::format_path_for_display;
use worktrunk::shell::Shell;
use worktrunk::styling::{
- FormattedMessage, PROGRESS_EMOJI, error_message, format_with_gutter, hint_message,
- info_message, progress_message, success_message, suggest_command, warning_message,
+ FormattedMessage, PROGRESS_EMOJI, SUCCESS_EMOJI, error_message, format_with_gutter,
+ hint_message, info_message, progress_message, success_message, suggest_command,
+ warning_message,
};
/// Format a switch message with a consistent location phrase
@@ -192,6 +193,69 @@ fn handle_branch_deletion_result(
}
}
+// ============================================================================
+// FlagNote: Workaround for cformat! being compile-time only
+// ============================================================================
+//
+// We want to parameterize the color (cyan/green) but can't because cformat!
+// parses color tags at compile time before generic substitution. So we have
+// duplicate methods (after_cyan, after_green) instead of after(color).
+//
+// This is ugly but unavoidable. Keep it encapsulated here.
+// ============================================================================
+
+struct FlagNote {
+ text: String,
+ symbol: Option<String>,
+ suffix: String,
+}
+
+impl FlagNote {
+ fn empty() -> Self {
+ Self {
+ text: String::new(),
+ symbol: None,
+ suffix: String::new(),
+ }
+ }
+
+ fn text_only(text: impl Into<String>) -> Self {
+ Self {
+ text: text.into(),
+ symbol: None,
+ suffix: String::new(),
+ }
+ }
+
+ fn with_symbol(
+ text: impl Into<String>,
+ symbol: impl Into<String>,
+ suffix: impl Into<String>,
+ ) -> Self {
+ Self {
+ text: text.into(),
+ symbol: Some(symbol.into()),
+ suffix: suffix.into(),
+ }
+ }
+
+ fn after_cyan(&self) -> String {
+ match &self.symbol {
+ Some(s) => cformat!("{}<cyan>{}</>", s, self.suffix),
+ None => String::new(),
+ }
+ }
+
+ fn after_green(&self) -> String {
+ match &self.symbol {
+ Some(s) => cformat!("{}<green>{}</>", s, self.suffix),
+ None => String::new(),
+ }
+ }
+}
+
+// ============================================================================
+
/// Get flag acknowledgment note for remove messages
///
/// `target_branch`: The branch we checked integration against (shown in reason)
@@ -199,27 +263,34 @@ fn get_flag_note(
deletion_mode: BranchDeletionMode,
outcome: &BranchDeletionOutcome,
target_branch: Option<&str>,
-) -> String {
+) -> FlagNote {
if deletion_mode.should_keep() {
- return " (--no-delete-branch)".to_string();
+ return FlagNote::text_only(" (--no-delete-branch)");
}
match outcome {
- BranchDeletionOutcome::NotDeleted => String::new(),
- BranchDeletionOutcome::ForceDeleted => " (--force-delete)".to_string(),
+ BranchDeletionOutcome::NotDeleted => FlagNote::empty(),
+ BranchDeletionOutcome::ForceDeleted => FlagNote::text_only(" (--force-delete)"),
BranchDeletionOutcome::Integrated(reason) => {
let Some(target) = target_branch else {
- return String::new();
+ return FlagNote::empty();
};
let symbol = reason.symbol();
let desc = reason.description();
- cformat!(" ({desc} <bold>{target}</>, <dim>{symbol}</>)")
+ FlagNote::with_symbol(
+ cformat!(" ({desc} <bold>{target}</>,"),
+ cformat!(" <dim>{symbol}</>"),
+ ")",
+ )
}
}
}
/// Format message for remove worktree operation (includes emoji and color for consistency)
///
+/// Returns a FormattedMessage with green styling for success messages.
+/// The symbol (if present) is placed outside the green so it renders in its canonical dim styling.
+///
/// `target_branch`: The branch we checked integration against (Some = merge context, None = explicit remove)
fn format_remove_worktree_message(
main_path: &std::path::Path,
@@ -229,7 +300,7 @@ fn format_remove_worktree_message(
deletion_mode: BranchDeletionMode,
outcome: &BranchDeletionOutcome,
target_branch: Option<&str>,
-) -> String {
+) -> FormattedMessage {
let flag_note = get_flag_note(deletion_mode, outcome, target_branch);
let branch_display = branch.or(Some(branch_name));
@@ -254,21 +325,27 @@ fn format_remove_worktree_message(
"worktree"
};
- if changed_directory {
+ // Symbol is placed AFTER closing green so it renders in its canonical dim styling.
+ let flag_text = &flag_note.text;
+ let flag_after = flag_note.after_green();
+ let msg = if changed_directory {
if let Some(b) = branch_display {
cformat!(
- "Removed <bold>{b}</> {action_suffix}; changed directory to <bold>{path_display}</>{flag_note}"
+ "{SUCCESS_EMOJI} <green>Removed <bold>{b}</> {action_suffix}; changed directory to <bold>{path_display}</>{flag_text}</>{flag_after}"
)
} else {
cformat!(
- "Removed {action_suffix}; changed directory to <bold>{path_display}</>{flag_note}"
+ "{SUCCESS_EMOJI} <green>Removed {action_suffix}; changed directory to <bold>{path_display}</>{flag_text}</>{flag_after}"
)
}
} else if let Some(b) = branch_display {
- cformat!("Removed <bold>{b}</> {action_suffix}{flag_note}")
+ cformat!(
+ "{SUCCESS_EMOJI} <green>Removed <bold>{b}</> {action_suffix}{flag_text}</>{flag_after}"
+ )
} else {
- format!("Removed {action_suffix}{flag_note}")
- }
+ cformat!("{SUCCESS_EMOJI} <green>Removed {action_suffix}{flag_text}</>{flag_after}")
+ };
+ FormattedMessage::new(msg)
}
/// Shell integration hint message
@@ -482,8 +559,10 @@ fn handle_branch_only_output(
&deletion.outcome,
Some(&deletion.effective_target),
);
- super::print(success_message(cformat!(
- "Removed branch <bold>{branch_name}</>{flag_note}"
+ let flag_text = &flag_note.text;
+ let flag_after = flag_note.after_green();
+ super::print(FormattedMessage::new(cformat!(
+ "{SUCCESS_EMOJI} <green>Removed branch <bold>{branch_name}</>{flag_text}</>{flag_after}"
)))?;
}
@@ -594,18 +673,20 @@ fn handle_removed_worktree_output(
);
let flag_note = get_flag_note(deletion_mode, &outcome, effective_target.as_deref());
+ let flag_text = &flag_note.text;
+ let flag_after = flag_note.after_cyan();
// Reason in parentheses: user flags shown explicitly, integration reason for automatic cleanup
// Note: We use FormattedMessage directly instead of progress_message() to control
- // where cyan styling ends. The flag_note (integration reason) should use standard
- // colors so the symbol appears in its canonical dim styling, not cyan.
+ // where cyan styling ends. The symbol appears after closing cyan so it renders
+ // in its canonical dim styling, not tinted by cyan.
let action = if deletion_mode.should_keep() {
cformat!(
- "{PROGRESS_EMOJI} <cyan>Removing <bold>{branch_name}</> worktree in background; retaining branch</>{flag_note}"
+ "{PROGRESS_EMOJI} <cyan>Removing <bold>{branch_name}</> worktree in background; retaining branch{flag_text}</>{flag_after}"
)
} else if should_delete_branch {
cformat!(
- "{PROGRESS_EMOJI} <cyan>Removing <bold>{branch_name}</> worktree & branch in background</>{flag_note}"
+ "{PROGRESS_EMOJI} <cyan>Removing <bold>{branch_name}</> worktree & branch in background{flag_text}</>{flag_after}"
)
} else {
cformat!(
@@ -680,7 +761,7 @@ fn handle_removed_worktree_output(
};
// Show success message (includes emoji and color)
- super::print(success_message(format_remove_worktree_message(
+ super::print(format_remove_worktree_message(
main_path,
changed_directory,
branch_name,
@@ -688,7 +769,7 @@ fn handle_removed_worktree_output(
deletion_mode,
&outcome,
effective_target.as_deref(),
- )))?;
+ ))?;
// Show hint for unmerged branches (after success message)
if show_hint {
@@ -907,37 +988,37 @@ mod tests {
#[test]
fn test_get_flag_note() {
- // --no-delete-branch flag
- assert_eq!(
- get_flag_note(
- BranchDeletionMode::Keep,
- &BranchDeletionOutcome::NotDeleted,
- None
- ),
- " (--no-delete-branch)"
+ // --no-delete-branch flag (text only, no symbol, no suffix)
+ let note = get_flag_note(
+ BranchDeletionMode::Keep,
+ &BranchDeletionOutcome::NotDeleted,
+ None,
);
+ assert_eq!(note.text, " (--no-delete-branch)");
+ assert!(note.symbol.is_none());
+ assert!(note.suffix.is_empty());
- // NotDeleted without flag
- assert_eq!(
- get_flag_note(
- BranchDeletionMode::SafeDelete,
- &BranchDeletionOutcome::NotDeleted,
- None
- ),
- ""
+ // NotDeleted without flag (empty)
+ let note = get_flag_note(
+ BranchDeletionMode::SafeDelete,
+ &BranchDeletionOutcome::NotDeleted,
+ None,
);
+ assert!(note.text.is_empty());
+ assert!(note.symbol.is_none());
+ assert!(note.suffix.is_empty());
- // Force deleted
- assert_eq!(
- get_flag_note(
- BranchDeletionMode::ForceDelete,
- &BranchDeletionOutcome::ForceDeleted,
- None
- ),
- " (--force-delete)"
+ // Force deleted (text only, no symbol, no suffix)
+ let note = get_flag_note(
+ BranchDeletionMode::ForceDelete,
+ &BranchDeletionOutcome::ForceDeleted,
+ None,
);
+ assert_eq!(note.text, " (--force-delete)");
+ assert!(note.symbol.is_none());
+ assert!(note.suffix.is_empty());
- // Integration reasons - check description and target separately since target is styled
+ // Integration reasons - text includes description and target, symbol is separate, suffix is closing paren
let cases = [
(IntegrationReason::SameCommit, "same commit as"),
(IntegrationReason::Ancestor, "ancestor of"),
@@ -952,14 +1033,30 @@ mod tests {
Some("main"),
);
assert!(
- note.contains(expected_desc),
- "reason {:?} should contain '{}'",
+ note.text.contains(expected_desc),
+ "reason {:?} text should contain '{}'",
reason,
expected_desc
);
assert!(
- note.contains("main"),
- "reason {:?} should contain target 'main'",
+ note.text.contains("main"),
+ "reason {:?} text should contain target 'main'",
+ reason
+ );
+ assert!(
+ note.symbol.is_some(),
+ "reason {:?} should have a symbol",
+ reason
+ );
+ let symbol = note.symbol.as_ref().unwrap();
+ assert!(
+ symbol.contains(reason.symbol()),
+ "reason {:?} symbol part should contain the symbol",
+ reason
+ );
+ assert_eq!(
+ note.suffix, ")",
+ "reason {:?} suffix should be closing paren",
reason
);
}
@@ -979,10 +1076,10 @@ mod tests {
&BranchDeletionOutcome::Integrated(IntegrationReason::SameCommit),
Some("main"),
);
- assert!(msg.contains("feature"));
- assert!(msg.contains("worktree & branch"));
- assert!(msg.contains("same commit as"));
- assert!(msg.contains("main"));
+ assert!(msg.as_str().contains("feature"));
+ assert!(msg.as_str().contains("worktree & branch"));
+ assert!(msg.as_str().contains("same commit as"));
+ assert!(msg.as_str().contains("main"));
// Removed worktree only (--no-delete-branch)
let msg = format_remove_worktree_message(
@@ -994,9 +1091,9 @@ mod tests {
&BranchDeletionOutcome::NotDeleted,
None,
);
- assert!(msg.contains("worktree"));
- assert!(!msg.contains("& branch"));
- assert!(msg.contains("--no-delete-branch"));
+ assert!(msg.as_str().contains("worktree"));
+ assert!(!msg.as_str().contains("& branch"));
+ assert!(msg.as_str().contains("--no-delete-branch"));
// Removed with directory change
let msg = format_remove_worktree_message(
@@ -1008,8 +1105,8 @@ mod tests {
&BranchDeletionOutcome::ForceDeleted,
None,
);
- assert!(msg.contains("changed directory"));
- assert!(msg.contains("--force-delete"));
+ assert!(msg.as_str().contains("changed directory"));
+ assert!(msg.as_str().contains("--force-delete"));
// Unmerged branch retained
let msg = format_remove_worktree_message(
@@ -1021,7 +1118,7 @@ mod tests {
&BranchDeletionOutcome::NotDeleted,
None,
);
- assert!(msg.contains("retaining unmerged branch"));
+ assert!(msg.as_str().contains("retaining unmerged branch"));
}
#[test]
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap
index c775f12b0..3b0326ec4 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap
@@ -27,4 +27,4 @@ expression: output.normalized()
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main, _)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap
index c775f12b0..3b0326ec4 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap
@@ -27,4 +27,4 @@ expression: output.normalized()
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main, _)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
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 1b57dc5b7..18158ec6d 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
@@ -16,4 +16,4 @@ expression: output.normalized()
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main, _)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
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 1b57dc5b7..18158ec6d 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
@@ -16,4 +16,4 @@ expression: output.normalized()
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main, _)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_pre_merge.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_pre_merge.snap
index a263e3923..3bea2f65c 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_pre_merge.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_pre_merge.snap
@@ -32,4 +32,4 @@ All checks passed!
  tests/test_auth.py | 14 ++++++++++++++
  2 files changed, 45 insertions(+)
✅ Merged to main (1 commit, 2 files, +45)
-🔄 Removing feature-auth worktree & branch in background (same commit as main, _)
+🔄 Removing feature-auth worktree & branch in background (same commit as main, _)
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_remove.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_remove.snap
index 5e23cd639..dc19dd262 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_remove.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_remove.snap
@@ -2,4 +2,4 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-🔄 Removing feature-api worktree & branch in background (same commit as main, _)
+🔄 Removing feature-api worktree & branch in background (same commit as main, _)
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__remove.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__remove.snap
index d35ea6512..a73fdab39 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__remove.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__remove.snap
@@ -2,4 +2,4 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-🔄 Removing to-remove worktree & branch in background (same commit as main, _)
+🔄 Removing to-remove worktree & branch in background (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_powershell_directive.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_powershell_directive.snap
index d90071017..40f2e209e 100644
--- a/tests/snapshots/integration__integration_tests__directives__merge_internal_powershell_directive.snap
+++ b/tests/snapshots/integration__integration_tests__directives__merge_internal_powershell_directive.snap
@@ -37,4 +37,4 @@ Set-Location _REPO_
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main, _)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
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 c37bf7be1..ce91659f5 100644
--- a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap
+++ b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap
@@ -37,4 +37,4 @@ cd _REPO_
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main, _)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__directives__remove_internal_powershell_directive.snap b/tests/snapshots/integration__integration_tests__directives__remove_internal_powershell_directive.snap
index 56293d420..048afc8aa 100644
--- a/tests/snapshots/integration__integration_tests__directives__remove_internal_powershell_directive.snap
+++ b/tests/snapshots/integration__integration_tests__directives__remove_internal_powershell_directive.snap
@@ -31,4 +31,4 @@ exit_code: 0
Set-Location _REPO_
----- stderr -----
-🔄 Removing feature worktree & branch in background (same commit as main, _)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
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 3cc5f15ab..644844160 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap
@@ -19,6 +19,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -40,4 +41,4 @@ exit_code: 0
  file2.txt | 1 +
  2 files changed, 2 insertions(+)
✅ Merged to main (1 commit, 2 files, +2)
-🔄 Removing feature worktree & branch in background (same commit as main, _)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
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 3065237d4..646b25373 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
@@ -19,6 +19,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -43,4 +44,4 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main, _)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
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 886f13790..9bc91a73a 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
@@ -19,6 +19,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -39,4 +40,4 @@ exit_code: 0
  auth.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main, _)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
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 f19577566..e7b1aeb18 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
@@ -19,6 +19,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -40,4 +41,4 @@ exit_code: 0
  dirty.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main, _)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
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 6beb9da8a..9b2cd4c3d 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
@@ -19,6 +19,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -34,4 +35,4 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main, _)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap
index 8b65dc405..b7a19391b 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap
@@ -19,6 +19,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -30,4 +31,4 @@ exit_code: 0
----- stderr -----
⚪ Already up to date with main (no new commits, no rebase needed)
-🔄 Removing no-commits worktree & branch in background (same commit as main, _)
+🔄 Removing no-commits worktree & branch in background (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap
index bde5c32fb..402cd7733 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap
@@ -19,6 +19,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -40,4 +41,4 @@ exit_code: 0
  newfile.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing no-commits-dirty worktree & branch in background (same commit as main, _)
+🔄 Removing no-commits-dirty worktree & branch in background (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_rebase_already_rebased.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_rebase_already_rebased.snap
index cb54e9ef7..66f5d3cef 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_rebase_already_rebased.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_rebase_already_rebased.snap
@@ -20,6 +20,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -35,4 +36,4 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main, _)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap
index a523da3bf..18be53cd4 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap
@@ -18,6 +18,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -33,4 +34,4 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main, _)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
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 8de11017d..4f2fe00f4 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
@@ -20,6 +20,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -37,4 +38,4 @@ exit_code: 0
  file2.txt | 1 +
  2 files changed, 2 insertions(+)
✅ Merged to main (2 commits, 2 files, +2)
-🔄 Removing feature worktree & branch in background (same commit as main, _)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
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 08f28db7b..e7eaf5c65 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
@@ -19,6 +19,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -34,4 +35,4 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main, _)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
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 b8a2e4455..059f6a53e 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
@@ -36,7 +36,7 @@ exit_code: 1
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main, _)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
🔄 Running project post-merge:
  exit 1
🟡 Command failed: exit status: 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 416c3c74a..4d7332ef9 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
@@ -20,6 +20,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -35,7 +36,7 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main, _)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
🔄 Running project post-merge notify:
  echo 'Merge to main complete' > notify.txt
🔄 Running project post-merge deploy:
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snap
index 8e240d483..2868b08fa 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snap
@@ -21,6 +21,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -36,4 +37,4 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main, _)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
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 e1bc0ef53..4e4ba9b96 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
@@ -20,6 +20,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -35,6 +36,6 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main, _)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
🔄 Running project post-merge:
  echo 'merged feature to main' > post-merge-ran.txt
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_with_nothing_to_merge.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_with_nothing_to_merge.snap
index f184ecf0a..bccc65150 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_with_nothing_to_merge.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_with_nothing_to_merge.snap
@@ -20,6 +20,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -31,6 +32,6 @@ exit_code: 0
----- stderr -----
⚪ Already up to date with main (no new commits, no rebase needed)
-🔄 Removing feature worktree & branch in background (same commit as main, _)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
🔄 Running project post-merge:
  echo 'post-merge ran' > post-merge-ran.txt
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap
index 2b62094c3..9665b3f5b 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
@@ -20,6 +20,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -44,4 +45,4 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main, _)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
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 00e482c3d..66c81166f 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
@@ -20,6 +20,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -41,4 +42,4 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main, _)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snap
index 31e89d886..eb1911a23 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
@@ -20,6 +20,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -35,4 +36,4 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main, _)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
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 865fe5e3f..4e1bdf003 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
@@ -20,6 +20,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -37,4 +38,4 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main, _)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
diff --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.snap
index a118f0703..bd819c2b7 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
@@ -20,6 +20,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -38,4 +39,4 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main, _)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap
index e98bace9d..d3bde84ff 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap
@@ -19,6 +19,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -34,4 +35,4 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature-from-develop worktree & branch in background (same commit as main, _)
+🔄 Removing feature-from-develop worktree & branch in background (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap
index 0887a7f44..e5820f0b6 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap
@@ -19,6 +19,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -36,4 +37,4 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature-dirty-primary worktree & branch in background (same commit as main, _)
+🔄 Removing feature-dirty-primary worktree & branch in background (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_rebase_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_rebase_fast_forward.snap
index 1dde87787..a464105a5 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_rebase_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_rebase_fast_forward.snap
@@ -19,6 +19,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -31,4 +32,4 @@ exit_code: 0
----- stderr -----
✅ Fast-forwarded to main
⚪ Already up to date with main (no new commits)
-🔄 Removing fast-forward-test worktree & branch in background (same commit as main, _)
+🔄 Removing fast-forward-test worktree & branch in background (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_rebase_true_rebase.snap b/tests/snapshots/integration__integration_tests__merge__merge_rebase_true_rebase.snap
index a481480b8..c13d3b7c2 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_rebase_true_rebase.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_rebase_true_rebase.snap
@@ -19,6 +19,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -36,4 +37,4 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing true-rebase-test worktree & branch in background (same commit as main, _)
+🔄 Removing true-rebase-test worktree & branch in background (same commit as main, _)
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 cddc17796..40c849a3c 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
@@ -19,6 +19,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -46,4 +47,4 @@ exit_code: 0
  file3.txt | 1 +
  3 files changed, 3 insertions(+)
✅ Merged to main (1 commit, 3 files, +3)
-🔄 Removing feature worktree & branch in background (same commit as main, _)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap
index c24f13808..84974210d 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap
@@ -19,6 +19,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -40,4 +41,4 @@ exit_code: 0
  - Revert to initial
⚪ No changes after squashing 3 commits
⚪ Already up to date with main (no new commits, no rebase needed)
-🔄 Removing feature worktree & branch in background (same commit as main, _)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
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 bc5076c09..b21d47c7d 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
@@ -19,6 +19,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -34,4 +35,4 @@ exit_code: 0
  file1.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main, _)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
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 d2998812b..7b821db17 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,6 +19,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -38,4 +39,4 @@ exit_code: 0
  auth.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main, _)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap
index 12e43f67c..c43b3af43 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap
@@ -19,6 +19,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_COMMIT_GENERATION__ARGS: "fix: update files"
@@ -42,4 +43,4 @@ exit_code: 0
  file2.txt | 1 +
  2 files changed, 2 insertions(+)
✅ Merged to main (1 commit, 2 files, +2)
-🔄 Removing feature worktree & branch in background (same commit as main, _)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
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 a523da3bf..18be53cd4 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
@@ -18,6 +18,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -33,4 +34,4 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main, _)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snap
index 0cce79c4e..2ae40d824 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snap
@@ -19,6 +19,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -36,4 +37,4 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to staging (1 commit, 1 file, +1)
-🔄 Removing feature-for-staging worktree & branch in background (same commit as staging, _)
+🔄 Removing feature-for-staging worktree & branch in background (same commit as staging, _)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snap b/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snap
index 6beb9da8a..9b2cd4c3d 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snap
@@ -19,6 +19,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -34,4 +35,4 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main, _)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap
index e511e5105..171838ee7 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap
@@ -19,6 +19,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -34,4 +35,4 @@ exit_code: 0
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background (same commit as main, _)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
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 df2f69b50..1edbfebae 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
@@ -19,6 +19,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_COMMIT_GENERATION__ARGS: "fix: commit changes"
@@ -46,4 +47,4 @@ exit_code: 0
  untracked2.txt | 1 +
  3 files changed, 3 insertions(+)
✅ Merged to main (1 commit, 3 files, +3)
-🔄 Removing feature worktree & branch in background (same commit as main, _)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
index 93f04d99e..18ea7f4db 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
@@ -20,6 +20,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -65,7 +66,7 @@ test result: ok. 18 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; fin
  jwt.rs | 8 ++++++++
  3 files changed, 33 insertions(+)
✅ Merged to main (1 commit, 3 files, +33)
-🔄 Removing feature-auth worktree & branch in background (same commit as main, _)
+🔄 Removing feature-auth worktree & branch in background (same commit as main, _)
🔄 Running project post-merge install:
  cargo install --path .
 Installing worktrunk v0.1.0
diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snap
index f8b5b5fe1..f5cdaf4e7 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snap
@@ -20,6 +20,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -60,4 +61,4 @@ All checks passed!
  tests/test_auth.py | 14 ++++++++++++++
  2 files changed, 45 insertions(+)
✅ Merged to main (1 commit, 2 files, +45)
-🔄 Removing feature-auth worktree & branch in background (same commit as main, _)
+🔄 Removing feature-auth worktree & branch in background (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
index 0c50b3ed7..170e648e6 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
@@ -19,6 +19,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -34,4 +35,4 @@ exit_code: 0
  auth.rs | 13 +++++++++++++
  1 file changed, 13 insertions(+)
✅ Merged to main (1 commit, 1 file, +13)
-🔄 Removing fix-auth worktree & branch in background (same commit as main, _)
+🔄 Removing fix-auth worktree & branch in background (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_executes.snap b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_executes.snap
index 17c4bc321..21bd1d641 100644
--- a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_executes.snap
+++ b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_executes.snap
@@ -20,6 +20,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -34,4 +35,4 @@ exit_code: 0
🔄 Running project pre-remove:
  echo 'About to remove worktree'
About to remove worktree
-✅ Removed feature-hook worktree & branch (same commit as main, _)
+✅ Removed feature-hook worktree & branch (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_skipped_with_no_verify.snap b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_skipped_with_no_verify.snap
index 9c2dfaf6f..ce2d43ff6 100644
--- a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_skipped_with_no_verify.snap
+++ b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_skipped_with_no_verify.snap
@@ -21,6 +21,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -32,4 +33,4 @@ exit_code: 0
----- stderr -----
🔄 Removing feature-skip worktree...
-✅ Removed feature-skip worktree & branch (same commit as main, _)
+✅ Removed feature-skip worktree & branch (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_template_variables.snap b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_template_variables.snap
index fca84857a..28a145b78 100644
--- a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_template_variables.snap
+++ b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_template_variables.snap
@@ -20,6 +20,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -40,4 +41,4 @@ exit_code: 0
🔄 Running project pre-remove worktree_name:
  echo 'Name: repo.feature-templates'
Name: repo.feature-templates
-✅ Removed feature-templates worktree & branch (same commit as main, _)
+✅ Removed feature-templates worktree & branch (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_branch_matching_tree_content.snap b/tests/snapshots/integration__integration_tests__remove__remove_branch_matching_tree_content.snap
index 6bfbed242..f849dea2b 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_branch_matching_tree_content.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_branch_matching_tree_content.snap
@@ -19,6 +19,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -30,4 +31,4 @@ exit_code: 0
----- stderr -----
🟡 No worktree found for branch feature-squashed
-✅ Removed branch feature-squashed (tree matches main, ⊂)
+✅ Removed branch feature-squashed (tree matches main, ⊂)
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_branch_no_worktree_path_occupied.snap b/tests/snapshots/integration__integration_tests__remove__remove_branch_no_worktree_path_occupied.snap
index c2fefcd1d..db10dcf74 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_branch_no_worktree_path_occupied.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_branch_no_worktree_path_occupied.snap
@@ -19,6 +19,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -30,4 +31,4 @@ exit_code: 0
----- stderr -----
🟡 No worktree found for branch npm
-✅ Removed branch npm (same commit as main, _)
+✅ Removed branch npm (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_branch_only_force_delete.snap b/tests/snapshots/integration__integration_tests__remove__remove_branch_only_force_delete.snap
index e3c8a90ef..05385e4c5 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_branch_only_force_delete.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_branch_only_force_delete.snap
@@ -7,6 +7,7 @@ info:
- "--force-delete"
- feature-force
env:
+ APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -14,10 +15,16 @@ info:
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
+ GIT_TERMINAL_PROMPT: "0"
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
+ USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_branch_only_merged.snap b/tests/snapshots/integration__integration_tests__remove__remove_branch_only_merged.snap
index f25194fe8..d9ffec465 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_branch_only_merged.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_branch_only_merged.snap
@@ -19,6 +19,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -30,4 +31,4 @@ exit_code: 0
----- stderr -----
🟡 No worktree found for branch feature-merged
-✅ Removed branch feature-merged (same commit as main, _)
+✅ Removed branch feature-merged (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snap b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snap
index cd00e12e5..ee27cc94c 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snap
@@ -19,6 +19,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -29,4 +30,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Removing feature-a worktree & branch in background (same commit as main, _)
+🔄 Removing feature-a worktree & branch in background (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snap b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snap
index bb805a223..77ed7c0cb 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snap
@@ -19,6 +19,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -29,4 +30,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Removing feature-b worktree & branch in background (same commit as main, _)
+🔄 Removing feature-b worktree & branch in background (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snap b/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snap
index 711ae6b29..408b6d2f3 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snap
@@ -19,6 +19,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -29,4 +30,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Removing feature-current worktree & branch in background (same commit as main, _)
+🔄 Removing feature-current worktree & branch in background (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_default_branch_no_tautology.snap b/tests/snapshots/integration__integration_tests__remove__remove_default_branch_no_tautology.snap
index 87008ad05..fcd0b7f04 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_default_branch_no_tautology.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_default_branch_no_tautology.snap
@@ -1,6 +1,5 @@
---
source: tests/integration_tests/remove.rs
-assertion_line: 640
info:
program: wt
args:
@@ -17,6 +16,7 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap b/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap
index 4b4f77d46..e8991e508 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap
@@ -20,6 +20,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -31,4 +32,4 @@ exit_code: 0
----- stderr -----
🔄 Removing feature-fg worktree...
-✅ Removed feature-fg worktree & branch (same commit as main, _)
+✅ Removed feature-fg worktree & branch (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_foreground_unmerged.snap b/tests/snapshots/integration__integration_tests__remove__remove_foreground_unmerged.snap
index 223ccb0d8..d31d8feec 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_foreground_unmerged.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_foreground_unmerged.snap
@@ -20,6 +20,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap b/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap
index d989d1726..919e60620 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap
@@ -18,6 +18,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -28,4 +29,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Removing feature-wt worktree & branch in background (same commit as main, _)
+🔄 Removing feature-wt worktree & branch in background (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap b/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap
index 80d100322..90cb65958 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap
@@ -31,4 +31,4 @@ exit_code: 0
cd _REPO_
----- stderr -----
-🔄 Removing feature-internal worktree & branch in background (same commit as main, _)
+🔄 Removing feature-internal worktree & branch in background (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__from_linked_succeeds.snap b/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__from_linked_succeeds.snap
index 307665811..a05e3fb2c 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__from_linked_succeeds.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__from_linked_succeeds.snap
@@ -30,4 +30,4 @@ exit_code: 0
----- stderr -----
🔄 Removing current worktree...
-✅ Removed feature worktree & branch; changed directory to _REPO_ (same commit as main, _)
+✅ Removed feature worktree & branch; changed directory to _REPO_ (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__from_main_by_name_succeeds.snap b/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__from_main_by_name_succeeds.snap
index 745517521..5680c5be4 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__from_main_by_name_succeeds.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__from_main_by_name_succeeds.snap
@@ -19,6 +19,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -29,4 +30,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Removing feature2 worktree & branch in background (same commit as main, _)
+🔄 Removing feature2 worktree & branch in background (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snap b/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snap
index 5ebb29cd9..ff35c6218 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snap
@@ -21,6 +21,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -31,6 +32,6 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Removing feature-b worktree & branch in background (same commit as main, _)
-🔄 Removing feature-c worktree & branch in background (same commit as main, _)
-🔄 Removing feature-a worktree & branch in background (same commit as main, _)
+🔄 Removing feature-b worktree & branch in background (same commit as main, _)
+🔄 Removing feature-c worktree & branch in background (same commit as main, _)
+🔄 Removing feature-a worktree & branch in background (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap
index c17cc26d2..b47badecf 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap
@@ -21,6 +21,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -31,6 +32,6 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Removing feature-a worktree & branch in background (same commit as main, _)
-🔄 Removing feature-b worktree & branch in background (same commit as main, _)
-🔄 Removing feature-c worktree & branch in background (same commit as main, _)
+🔄 Removing feature-a worktree & branch in background (same commit as main, _)
+🔄 Removing feature-b worktree & branch in background (same commit as main, _)
+🔄 Removing feature-c worktree & branch in background (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_no_delete_branch.snap b/tests/snapshots/integration__integration_tests__remove__remove_no_delete_branch.snap
index e8764b381..832c81699 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_no_delete_branch.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_no_delete_branch.snap
@@ -20,6 +20,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -30,4 +31,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Removing feature-keep worktree in background; retaining branch (--no-delete-branch)
+🔄 Removing feature-keep worktree in background; retaining branch (--no-delete-branch)
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_partial_success.snap b/tests/snapshots/integration__integration_tests__remove__remove_partial_success.snap
index f24482acf..3c5848ed5 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_partial_success.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_partial_success.snap
@@ -20,6 +20,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -30,5 +31,5 @@ exit_code: 1
----- stdout -----
----- stderr -----
-🔄 Removing feature worktree & branch in background (same commit as main, _)
+🔄 Removing feature worktree & branch in background (same commit as main, _)
❌ No worktree found for branch nonexistent
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_squash_merged_then_main_advanced.snap b/tests/snapshots/integration__integration_tests__remove__remove_squash_merged_then_main_advanced.snap
index 5cc42800a..210bf55a3 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_squash_merged_then_main_advanced.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_squash_merged_then_main_advanced.snap
@@ -19,6 +19,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -30,4 +31,4 @@ exit_code: 0
----- stderr -----
🟡 No worktree found for branch feature-squash
-✅ Removed branch feature-squash (all changes in main, ⊂)
+✅ Removed branch feature-squash (all changes in main, ⊂)
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_remove_executes.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_remove_executes.snap
index cc482d026..1ce5b136a 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_remove_executes.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_remove_executes.snap
@@ -20,6 +20,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -32,4 +33,4 @@ exit_code: 0
----- stderr -----
🔄 Running user pre-remove cleanup:
  echo 'USER_PRE_REMOVE_RAN' > ../user_preremove_marker.txt
-🔄 Removing feature worktree & branch in background (--force-delete)
+🔄 Removing feature worktree & branch in background (--force-delete)
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_remove_skipped_no_verify.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_remove_skipped_no_verify.snap
index ad5bf22de..068bdd12b 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_remove_skipped_no_verify.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_remove_skipped_no_verify.snap
@@ -21,6 +21,7 @@ info:
LANG: C
LC_ALL: C
PATH: "[PATH]"
+ RUST_LOG: warn
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
@@ -31,4 +32,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Removing feature worktree & branch in background (--force-delete)
+🔄 Removing feature worktree & branch in background (--force-delete)