Skip to content

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

Refactor output functions for commit messages

Maximilian Roosf291bafba0af
diff --git a/src/commands/dev.rs b/src/commands/dev.rs
index f05d2f2fa..a398e490b 100644
--- a/src/commands/dev.rs
+++ b/src/commands/dev.rs
@@ -275,7 +275,7 @@ pub fn handle_dev_squash(
// Display the generated commit message
let formatted_message = format_commit_message_for_display(&commit_message);
- crate::output::progress(format_with_gutter(&formatted_message, "", None))?;
+ crate::output::gutter(format_with_gutter(&formatted_message, "", None))?;
// Reset to merge base (soft reset stages all changes, including any already-staged uncommitted changes)
repo.run_command(&["reset", "--soft", &merge_base])
diff --git a/src/commands/merge.rs b/src/commands/merge.rs
index a9b09946c..29cd867f0 100644
--- a/src/commands/merge.rs
+++ b/src/commands/merge.rs
@@ -404,7 +404,7 @@ pub fn commit_staged_changes(
let commit_message = crate::llm::generate_commit_message(commit_generation_config)?;
let formatted_message = format_commit_message_for_display(&commit_message);
- crate::output::progress(format_with_gutter(&formatted_message, "", None))?;
+ crate::output::gutter(format_with_gutter(&formatted_message, "", None))?;
repo.run_command(&["commit", "-m", &commit_message])
.git_context("Failed to commit")?;
diff --git a/src/output/directive.rs b/src/output/directive.rs
index f58b797e6..64dead50e 100644
--- a/src/output/directive.rs
+++ b/src/output/directive.rs
@@ -75,6 +75,12 @@ impl DirectiveOutput {
io::stdout().flush()
}
+ pub fn gutter(&mut self, content: String) -> io::Result<()> {
+ // Gutter content has its own visual structure - print with NUL terminator
+ write!(io::stdout(), "{content}\0")?;
+ io::stdout().flush()
+ }
+
pub fn change_directory(&mut self, path: &Path) -> io::Result<()> {
write!(io::stdout(), "__WORKTRUNK_CD__{}\0", path.display())?;
io::stdout().flush()
diff --git a/src/output/global.rs b/src/output/global.rs
index fbf5e960e..c28a27d21 100644
--- a/src/output/global.rs
+++ b/src/output/global.rs
@@ -124,6 +124,20 @@ pub fn warning(message: impl Into<String>) -> io::Result<()> {
})
}
+/// Emit gutter-formatted content
+///
+/// Gutter content has its own visual structure (column 0 gutter + content),
+/// so no additional emoji is added. Use with `format_with_gutter()` or `format_bash_with_gutter()`.
+pub fn gutter(content: impl Into<String>) -> io::Result<()> {
+ OUTPUT_CONTEXT.with(|ctx| {
+ let c = content.into();
+ match &mut *ctx.borrow_mut() {
+ OutputHandler::Interactive(i) => i.gutter(c),
+ OutputHandler::Directive(d) => d.gutter(c),
+ }
+ })
+}
+
/// Request directory change (for shell integration)
pub fn change_directory(path: impl AsRef<Path>) -> io::Result<()> {
OUTPUT_CONTEXT.with(|ctx| {
diff --git a/src/output/interactive.rs b/src/output/interactive.rs
index 1adc102f6..68b14c3d3 100644
--- a/src/output/interactive.rs
+++ b/src/output/interactive.rs
@@ -57,6 +57,14 @@ impl InteractiveOutput {
Ok(())
}
+ pub fn gutter(&mut self, content: String) -> io::Result<()> {
+ // Gutter content has its own visual structure - just print it
+ use worktrunk::styling::print;
+ print!("{content}");
+ stdout().flush()?;
+ Ok(())
+ }
+
pub fn change_directory(&mut self, path: &Path) -> io::Result<()> {
// In interactive mode, we can't actually change directory
// Just store the target for execute commands
diff --git a/src/output/mod.rs b/src/output/mod.rs
index 091adf54b..73511ba9c 100644
--- a/src/output/mod.rs
+++ b/src/output/mod.rs
@@ -63,8 +63,8 @@ pub mod interactive;
// Re-export the public API
pub use global::{
- OutputMode, change_directory, execute, flush, hint, info, initialize, progress, success,
- terminate_output, warning,
+ OutputMode, change_directory, execute, flush, gutter, hint, info, initialize, progress,
+ success, terminate_output, warning,
};
// Re-export output handlers
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 fcf4868d3..c71b60be6 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/.tmp8Fuaev/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmppEdO19/test-config.toml
---
success: true
exit_code: 0
@@ -26,12 +26,11 @@ exit_code: 0
πŸ”„ πŸ”„ Squashing 2 commits with working tree changes into 1 (2 files, +2)...
πŸ”„ πŸ”„ Generating squash commit message...
πŸ’‘ πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
-πŸ”„   Squash commits from main
+  Squash commits from main
 
  Combined commits:
  - feat: add file 1
  - feat: add file 2
-
βœ… Squashed @ [SHA]
πŸ”„ πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
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 fb64986b6..b85ea8e4f 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/.tmp8INIVm/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpplv8io/test-config.toml
---
success: true
exit_code: 0
@@ -24,11 +24,10 @@ exit_code: 0
πŸ”„ πŸ”„ Squashing 1 commit with working tree changes into 1 (1 file, +1)...
πŸ”„ πŸ”„ Generating squash commit message...
πŸ’‘ πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
-πŸ”„   Squash commits from main
+  Squash commits from main
 
  Combined commits:
  - feat: initial feature
-
βœ… Squashed @ [SHA]
πŸ”„ πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
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 a02611d0f..a88944b2c 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/.tmpsO7Iiu/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp86EBno/test-config.toml
---
success: true
exit_code: 0
@@ -26,11 +26,10 @@ exit_code: 0
πŸ”„ πŸ”„ Squashing 1 commit with working tree changes into 1 (1 file, +1)...
πŸ”„ πŸ”„ Generating squash commit message...
πŸ’‘ πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
-πŸ”„   Squash commits from main
+  Squash commits from main
 
  Combined commits:
  - feat: add authentication
-
βœ… Squashed @ [SHA]
πŸ”„ πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
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 0850ad444..9c0021e98 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/.tmpUDjGH8/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQy91S9/test-config.toml
---
success: true
exit_code: 0
@@ -24,8 +24,7 @@ exit_code: 0
🟑 Auto-staging untracked files: dirty.txt
πŸ”„ πŸ”„ Committing with default message... (1 file, +1, no squashing needed)
πŸ’‘ πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
-πŸ”„   Changes to dirty.txt
-
+  Changes to dirty.txt
βœ… βœ… Committed changes @ [SHA]
πŸ”„ πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap
index 23a6918b3..14a4e18ba 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
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpOGVlgB/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp1hD6up/test-config.toml
---
success: true
exit_code: 0
@@ -24,8 +24,7 @@ exit_code: 0
🟑 Auto-staging untracked files: newfile.txt
πŸ”„ πŸ”„ Committing with default message... (1 file, +1, no squashing needed)
πŸ’‘ πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
-πŸ”„   Changes to newfile.txt
-
+  Changes to newfile.txt
βœ… βœ… Committed changes @ [SHA]
πŸ”„ πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap
index 99992d28d..8103f0b46 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpMFB6RS/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpCqa2rJ/test-config.toml
---
success: true
exit_code: 0
@@ -28,8 +28,7 @@ exit_code: 0
πŸ”„ πŸ”„ Committing with default message... (1 file, +1, no squashing needed)
πŸ’‘ πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
-πŸ”„   Changes to feature.txt
-
+  Changes to feature.txt
βœ… βœ… Committed changes @ [SHA]
πŸ”„ πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
index 81427b4fd..b4d833dcf 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/.tmpYW0X5a/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKclpE4/test-config.toml
---
success: true
exit_code: 0
@@ -24,13 +24,12 @@ exit_code: 0
πŸ”„ πŸ”„ Squashing 3 commits into 1 (3 files, +3)...
πŸ”„ πŸ”„ Generating squash commit message...
πŸ’‘ πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
-πŸ”„   Squash commits from main
+  Squash commits from main
 
  Combined commits:
  - feat: add file 1
  - fix: update logic
  - docs: update readme
-
βœ… Squashed @ [SHA]
πŸ”„ πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
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 e93b8e79d..6d24b66e4 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
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpXqNYIS/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpWdfMsb/test-config.toml
---
success: true
exit_code: 0
@@ -24,13 +24,12 @@ exit_code: 0
πŸ”„ πŸ”„ Squashing 3 commits into 1...
πŸ”„ πŸ”„ Generating squash commit message...
πŸ’‘ πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
-πŸ”„   Squash commits from main
+  Squash commits from main
 
  Combined commits:
  - Change 1
  - Change 2
  - Revert to initial
-
βšͺ No changes after squashing 3 commits (commits resulted in no net changes)
πŸ”„ βœ… Merged to main
βœ… βœ… Returned to primary at [REPO]
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 3d74f0d4a..5fc5ba45a 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/.tmpVclthU/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpda5EoJ/test-config.toml
---
success: true
exit_code: 0
@@ -25,12 +25,11 @@ exit_code: 0
πŸ”„ πŸ”„ Squashing 2 commits into 1 (2 files, +2)...
πŸ”„ πŸ”„ Generating squash commit message...
πŸ’‘ πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
-πŸ”„   Squash commits from main
+  Squash commits from main
 
  Combined commits:
  - feat: new feature
  - fix: bug fix
-
βœ… Squashed @ [SHA]
πŸ”„ πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
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 e3042d34e..b24198715 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/.tmphEOjtj/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp6gu5HM/test-config.toml
---
success: true
exit_code: 0
@@ -27,12 +27,11 @@ exit_code: 0
πŸ”„ πŸ”„ Squashing 2 commits into 1 (1 file, +1)...
πŸ”„ πŸ”„ Generating squash commit message...
πŸ’‘ πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
-πŸ”„   Squash commits from main
+  Squash commits from main
 
  Combined commits:
  - feat: add authentication
  - fix: handle edge case
-
βœ… Squashed @ [SHA]
πŸ”„ πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
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 868ea0e8f..013b885ff 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/.tmp8D7Rdi/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJM6Rcw/test-config.toml
---
success: true
exit_code: 0
@@ -27,11 +27,10 @@ exit_code: 0
πŸ”„ πŸ”„ Squashing 1 commit with working tree changes into 1 (1 file, +1)...
πŸ”„ πŸ”„ Generating squash commit message...
πŸ’‘ πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
-πŸ”„   Squash commits from main
+  Squash commits from main
 
  Combined commits:
  - feat: add file 1
-
βœ… Squashed @ [SHA]
πŸ”„ πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
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 32a0f3e5d..d67e0dda2 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
@@ -16,16 +16,16 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
- PATH: "/private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmphCOEV1/test-repo/.bin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
+ PATH: "/private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmplXVBIC/test-repo/.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/.tmphCOEV1/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmplXVBIC/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
+  feat(auth): Implement JWT authentication system
 
  Add comprehensive JWT token handling including validation, refresh logic,
  and authentication tests. This establishes the foundation for secure
@@ -34,7 +34,6 @@ exit_code: 0
  - Implement token refresh mechanism with expiry handling
  - Add JWT encoding/decoding with signature verification
  - Create test suite covering all authentication flows
-
βœ… Squashed @ [SHA]
πŸ”„ Running pre-merge: test
πŸ”„   cargo test