Skip to content

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

Revert "Remove SHA redaction from snapshots"

Maximilian Roos6151cfa23bf9
diff --git a/README.md b/README.md
index 1921ce58b..fccbd89a7 100644
--- a/README.md
+++ b/README.md
@@ -44,8 +44,8 @@ This creates `../repo.fix-auth` on branch `fix-auth`.
```console
$ wt merge
-πŸ”„ Merging 1 commit to main @ a1b2c3d (no commit/squash/rebase needed)
- * a1b2c3d Implement JWT validation
+πŸ”„ Merging 1 commit to main @ d29e0fd (no commit/squash/rebase needed)
+ * d29e0fd Implement JWT validation
auth.rs | 13 +++++++++++++
1 file changed, 13 insertions(+)
βœ… Merged to main (1 commit, 1 file, +13)
@@ -162,7 +162,7 @@ $ wt merge
- Implement token refresh mechanism with expiry handling
- Add JWT encoding/decoding with signature verification
- Create test suite covering all authentication flows
-βœ… Squashed @ a1b2c3d
+βœ… Squashed @ 95c3316
πŸ”„ Running pre-merge test:
cargo test
Finished test [unoptimized + debuginfo] target(s) in 0.12s
@@ -179,8 +179,8 @@ test result: ok. 18 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; fin
cargo clippy
Checking worktrunk v0.1.0
Finished dev [unoptimized + debuginfo] target(s) in 1.23s
-πŸ”„ Merging 1 commit to main @ a1b2c3d (no rebase needed)
- * a1b2c3d feat(auth): Implement JWT authentication system
+πŸ”„ Merging 1 commit to main @ 95c3316 (no rebase needed)
+ * 95c3316 feat(auth): Implement JWT authentication system
auth.rs | 8 ++++++++
auth_test.rs | 17 +++++++++++++++++
jwt.rs | 8 ++++++++
@@ -256,7 +256,7 @@ $ wt merge
Implement login and token refresh endpoints with JWT validation.
Includes comprehensive test coverage and input validation.
-βœ… Squashed @ a1b2c3d
+βœ… Squashed @ [HASH]
πŸ”„ Running pre-merge test:
uv run pytest
@@ -274,8 +274,8 @@ tests/test_auth.py::test_token_validation PASSED [100%]
All checks passed!
-πŸ”„ Merging 1 commit to main @ a1b2c3d (no rebase needed)
- * a1b2c3d feat(api): Add user authentication endpoints
+πŸ”„ Merging 1 commit to main @ [HASH] (no rebase needed)
+ * [HASH] feat(api): Add user authentication endpoints
api/auth.py | 31 +++++++++++++++++++++++++++++++
tests/test_auth.py | 14 ++++++++++++++
2 files changed, 45 insertions(+)
diff --git a/tests/common/list_snapshots.rs b/tests/common/list_snapshots.rs
index 56f9794c6..dcead5aff 100644
--- a/tests/common/list_snapshots.rs
+++ b/tests/common/list_snapshots.rs
@@ -21,7 +21,6 @@ fn base_settings(repo: &TestRepo) -> Settings {
pub fn standard_settings(repo: &TestRepo) -> Settings {
let mut settings = base_settings(repo);
- settings.add_filter(r"\b[0-9a-f]{7,40}\b", "[SHA] ");
// Normalize WORKTRUNK_CONFIG_PATH across platforms (macOS, Linux, Windows)
// macOS: /var/folders/.../T/.tmpXXX/test-config.toml
// Linux: /tmp/.tmpXXX/test-config.toml
@@ -34,7 +33,6 @@ pub fn standard_settings(repo: &TestRepo) -> Settings {
pub fn json_settings(repo: &TestRepo) -> Settings {
let mut settings = base_settings(repo);
- settings.add_filter(r#""head": "[0-9a-f]{40}""#, r#""head": "[SHA]""#);
settings.add_filter(r#""timestamp": \d+"#, r#""timestamp": 0"#);
settings.add_filter(r"\\u001b\[32m", "[GREEN]");
settings.add_filter(r"\\u001b\[31m", "[RED]");
diff --git a/tests/common/mod.rs b/tests/common/mod.rs
index 11bd93c4c..1ffb45c41 100644
--- a/tests/common/mod.rs
+++ b/tests/common/mod.rs
@@ -324,14 +324,10 @@ impl TestRepo {
/// Create a commit with a custom message (useful for testing malicious messages)
pub fn commit_with_message(&self, message: &str) {
- // Create a unique file to ensure there's something to commit
- use std::time::{SystemTime, UNIX_EPOCH};
- let timestamp = SystemTime::now()
- .duration_since(UNIX_EPOCH)
- .unwrap()
- .as_nanos();
- let file_path = self.root.join(format!("file-{}.txt", timestamp));
- std::fs::write(&file_path, "content").unwrap();
+ // Create a unique file based on message length (deterministic for reproducible SHAs)
+ // Use message bytes as a simple deterministic identifier
+ let file_path = self.root.join(format!("file-msg-{}.txt", message.len()));
+ std::fs::write(&file_path, message).unwrap();
self.git_command(&["add", "."]).output().unwrap();
@@ -746,13 +742,7 @@ pub fn setup_snapshot_settings(repo: &TestRepo) -> insta::Settings {
);
}
- // Normalize git SHAs and backslashes
- // First filter SHAs wrapped in ANSI color codes (more specific pattern)
- // Match: ESC[COLORmSHAESC[RESETm where RESET can be empty, 0, or other codes
- // Examples: \x1b[33m0b07a58\x1b[m or \x1b[2m0b07a58\x1b[0m
- settings.add_filter(r"\x1b\[[0-9;]*m[0-9a-f]{7,40}\x1b\[[0-9;]*m", "[SHA]");
- // Then filter plain SHAs (more general pattern)
- settings.add_filter(r"\b[0-9a-f]{7,40}\b", "[SHA]");
+ // Normalize backslashes (Windows paths)
settings.add_filter(r"\\", "/");
// Normalize temp directory paths in project identifiers (approval prompts)
@@ -785,9 +775,9 @@ pub fn setup_snapshot_settings(repo: &TestRepo) -> insta::Settings {
settings.add_redaction(".env.PATH", "[PATH]");
// Normalize timestamps in log filenames (format: YYYYMMDD-HHMMSS)
- // The SHA filter runs first, so we match: post-start-NAME-[SHA]-HHMMSS.log
+ // Match: post-start-NAME-SHA-HHMMSS.log
settings.add_filter(
- r"post-start-[^-]+-\[SHA\]-\d{6}\.log",
+ r"post-start-[^-]+-[0-9a-f]{7,40}-\d{6}\.log",
"post-start-[NAME]-[TIMESTAMP].log",
);
@@ -798,11 +788,19 @@ pub fn setup_snapshot_settings(repo: &TestRepo) -> insta::Settings {
settings.add_filter(r"(?m)^\x1b\[40m \x1b\[0m {1,2}hint:.*\n", "");
// Normalize Git error message format differences across versions
- // Older Git (< 2.43): "Could not apply [SHA]... # commit message"
- // Newer Git (>= 2.43): "Could not apply [SHA]... commit message"
+ // Older Git (< 2.43): "Could not apply SHA... # commit message"
+ // Newer Git (>= 2.43): "Could not apply SHA... commit message"
// Add the "# " prefix to newer Git output for consistency with snapshots
// Match if followed by a letter/character (not "#")
- settings.add_filter(r"(Could not apply \[SHA\]\.\.\.) ([A-Za-z])", "$1 # $2");
+ settings.add_filter(
+ r"(Could not apply [0-9a-f]{7,40}\.\.\.) ([A-Za-z])",
+ "$1 # $2",
+ );
+
+ // Normalize OS-specific error messages in gutter output
+ // Ubuntu may produce "Broken pipe (os error 32)" instead of the expected error
+ // when capturing stderr from shell commands due to timing/buffering differences
+ settings.add_filter(r"Broken pipe \(os error 32\)", "Error: connection refused");
settings
}
diff --git a/tests/integration_tests/directives.rs b/tests/integration_tests/directives.rs
index 8833d7489..25a501b8c 100644
--- a/tests/integration_tests/directives.rs
+++ b/tests/integration_tests/directives.rs
@@ -153,9 +153,7 @@ fn test_merge_internal_no_remove() {
.output()
.unwrap();
- let mut settings = setup_snapshot_settings(&repo);
- // Normalize SHA in output
- settings.add_filter(r"@ [a-f0-9]{7}", "@ [SHA]");
+ let settings = setup_snapshot_settings(&repo);
settings.bind(|| {
let mut cmd = wt_command();
@@ -208,8 +206,6 @@ fn test_merge_internal_remove() {
.unwrap();
let mut settings = setup_snapshot_settings(&repo);
- // Normalize SHA and path in output
- settings.add_filter(r"@ [a-f0-9]{7}", "@ [SHA]");
settings.add_filter(r"cd '[^']+'", "cd '[PATH]'");
settings.bind(|| {
diff --git a/tests/integration_tests/list.rs b/tests/integration_tests/list.rs
index 9acef3d6b..cb55f54a0 100644
--- a/tests/integration_tests/list.rs
+++ b/tests/integration_tests/list.rs
@@ -727,10 +727,7 @@ fn test_list_with_upstream_tracking() {
repo.add_worktree("no-upstream");
// Run list --branches --full to show all columns including Remote
- let mut settings = setup_snapshot_settings(&repo);
-
- // Additional custom filters
- settings.add_filter(r"\b[0-9a-f]{7,40}\b", "[SHA] ");
+ let settings = setup_snapshot_settings(&repo);
settings.bind(|| {
let mut cmd = wt_command();
diff --git a/tests/integration_tests/merge.rs b/tests/integration_tests/merge.rs
index c6a931017..39172e7a5 100644
--- a/tests/integration_tests/merge.rs
+++ b/tests/integration_tests/merge.rs
@@ -2452,12 +2452,12 @@ fn test_merge_no_commit_with_clean_tree() {
success: true
exit_code: 0
----- stdout -----
- πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+ πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
βœ… Merged to main (1 commit, 1 file, +1)
βšͺ Worktree preserved (--no-remove)
----- stderr -----
-   * [SHA] Add feature file
+   * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
");
@@ -2555,12 +2555,12 @@ fn test_merge_no_commit_no_squash_no_remove_redundant() {
success: true
exit_code: 0
----- stdout -----
- πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+ πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
βœ… Merged to main (1 commit, 1 file, +1)
βšͺ Worktree preserved (--no-remove)
----- stderr -----
-   * [SHA] Add feature file
+   * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
");
diff --git a/tests/integration_tests/readme_sync.rs b/tests/integration_tests/readme_sync.rs
index d2a0314c2..ebe33a21d 100644
--- a/tests/integration_tests/readme_sync.rs
+++ b/tests/integration_tests/readme_sync.rs
@@ -34,12 +34,6 @@ static ANSI_ESCAPE_REGEX: LazyLock<Regex> =
/// Regex to strip literal bracket notation (as stored in snapshots)
static ANSI_LITERAL_REGEX: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"\[[0-9;]*m").unwrap());
-/// Regex for SHA placeholder
-static SHA_REGEX: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"\[SHA\]").unwrap());
-
-/// Regex for HASH placeholder (used by shell_wrapper tests)
-static HASH_REGEX: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"\[HASH\]").unwrap());
-
/// Regex for TMPDIR paths
static TMPDIR_REGEX: LazyLock<Regex> =
LazyLock::new(|| Regex::new(r"\[TMPDIR\]/repo\.([^\s/]+)").unwrap());
@@ -214,9 +208,7 @@ fn parse_snapshot(path: &Path) -> Result<String, String> {
/// Normalize snapshot output for README display
fn normalize_for_readme(content: &str) -> String {
- let content = SHA_REGEX.replace_all(content, "a1b2c3d");
- let content = HASH_REGEX.replace_all(&content, "a1b2c3d");
- let content = TMPDIR_REGEX.replace_all(&content, "../repo.$1");
+ let content = TMPDIR_REGEX.replace_all(content, "../repo.$1");
let content = REPO_REGEX.replace_all(&content, "../repo");
// Trim trailing whitespace from each line and overall (matches pre-commit behavior)
diff --git a/tests/integration_tests/security.rs b/tests/integration_tests/security.rs
index 9e060f0da..0ad64bd50 100644
--- a/tests/integration_tests/security.rs
+++ b/tests/integration_tests/security.rs
@@ -297,7 +297,9 @@ fn test_commit_message_with_directive_not_executed() {
// Create a worktree
let _feature_wt = repo.add_worktree("feature");
- let settings = setup_snapshot_settings(&repo);
+ let mut settings = setup_snapshot_settings(&repo);
+ // Filter SHAs because commit_with_message creates non-deterministic hashes
+ settings.add_filter(r"\b[0-9a-f]{7,40}\b", "[SHA]");
// Run 'wt list' which might show commit messages
settings.bind(|| {
diff --git a/tests/integration_tests/shell_wrapper.rs b/tests/integration_tests/shell_wrapper.rs
index 574599fd3..f34736bd3 100644
--- a/tests/integration_tests/shell_wrapper.rs
+++ b/tests/integration_tests/shell_wrapper.rs
@@ -65,8 +65,8 @@ static WORKSPACE_REGEX: LazyLock<regex::Regex> = LazyLock::new(|| {
});
/// Regex for normalizing git commit hashes (7-character hex)
-/// Matches 7-character lowercase hex sequences (git short hashes)
/// Note: No word boundaries because ANSI codes (ending with 'm') directly precede hashes
+/// Shell wrapper tests produce non-deterministic SHAs due to PTY timing/environment
static COMMIT_HASH_REGEX: LazyLock<regex::Regex> =
LazyLock::new(|| regex::Regex::new(r"[0-9a-f]{7}").unwrap());
@@ -121,7 +121,7 @@ impl ShellOutput {
let workspace_normalized =
WORKSPACE_REGEX.replace_all(&tmpdir_normalized, "[WORKSPACE]/tests/fixtures/");
- // Normalize commit hashes (7-character hex strings)
+ // Normalize commit hashes (shell wrapper tests produce non-deterministic SHAs)
let hash_normalized = COMMIT_HASH_REGEX.replace_all(&workspace_normalized, "[HASH]");
// Collapse duplicate TMPDIR placeholders that can appear with nested mktemp paths.
@@ -1100,7 +1100,7 @@ approved-commands = [
// Copy the fixture script to the test repo to avoid path issues with special characters
// (CARGO_MANIFEST_DIR may contain single quotes like worktrunk.'βˆ…' which break shell parsing)
let fixtures_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("tests/fixtures");
- let script_content = fs::read(&fixtures_dir.join("mixed-output.sh")).unwrap();
+ let script_content = fs::read(fixtures_dir.join("mixed-output.sh")).unwrap();
let script_path = repo.root_path().join("mixed-output.sh");
fs::write(&script_path, &script_content).unwrap();
// Make the script executable
diff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap
index 7629fcc89..b8028744c 100644
--- a/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap
+++ b/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap
@@ -17,7 +17,8 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
@@ -25,8 +26,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-  * [SHA] Add feature file
+πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
+  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
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 5635d7cf8..68f1a0f40 100644
--- a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap
+++ b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap
@@ -16,7 +16,8 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
@@ -25,8 +26,8 @@ exit_code: 0
cd '[PATH]'
----- stderr -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
-  * [SHA] Add feature file
+πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
+  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
βœ… Merged to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap b/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap
index 5f3433a8e..f5b0e9a4f 100644
--- a/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap
+++ b/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap
@@ -25,6 +25,6 @@ exit_code: 0
----- stderr -----
Branch Status HEADΒ± main↕ Path Remoteβ‡… Commit Age Message
-@ main ^ . [SHA] 1d Initial commit
+@ main ^ . b834638e 1d Initial commit
βšͺ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snap b/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snap
index 3e84113dc..0e6eb15e5 100644
--- a/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snap
+++ b/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snap
@@ -15,7 +15,7 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
diff --git a/tests/snapshots/integration__integration_tests__list__json_with_git_operation.snap b/tests/snapshots/integration__integration_tests__list__json_with_git_operation.snap
index b21246be6..08e25cdbe 100644
--- a/tests/snapshots/integration__integration_tests__list__json_with_git_operation.snap
+++ b/tests/snapshots/integration__integration_tests__list__json_with_git_operation.snap
@@ -15,7 +15,7 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
diff --git a/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap b/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap
index 86379ffb2..3de0f408c 100644
--- a/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap
+++ b/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap
@@ -15,7 +15,7 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
diff --git a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
index 26dd47ad2..04a3c65f8 100644
--- a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
@@ -27,11 +27,11 @@ exit_code: 0
----- stderr -----
Branch Status HEADΒ± main↕ main…± Path Remoteβ‡… CI Commit Age Message
-@ main ^ ./repo ⇑0 ⇣0 [SHA] 1d Initial commit on main
-+ ahead ↑⇑ ↑2 +2 ./repo.ahead ⇑2 ⇣0 [SHA] 1d Ahead commit 2
-+ behind _ ⇣ ./repo.behind ⇑0 ⇣1 [SHA] 1d Initial commit on main
-+ diverged ↑β‡… ↑1 +1 ./repo.diverged ⇑1 ⇣1 [SHA] 1d Diverged local commit
-+ in-sync _ ./repo.in-sync ⇑0 ⇣0 [SHA] 1d Initial commit on main
-+ no-upstream _ ./repo.no-upstream [SHA] 1d Initial commit on main
+@ main ^ ./repo ⇑0 ⇣0 6c3da842 1d Initial commit on main
++ ahead ↑⇑ ↑2 +2 ./repo.ahead ⇑2 ⇣0 8d8f4673 1d Ahead commit 2
++ behind _ ⇣ ./repo.behind ⇑0 ⇣1 6c3da842 1d Initial commit on main
++ diverged ↑β‡… ↑1 +1 ./repo.diverged ⇑1 ⇣1 ca7cb696 1d Diverged local commit
++ in-sync _ ./repo.in-sync ⇑0 ⇣0 6c3da842 1d Initial commit on main
++ no-upstream _ ./repo.no-upstream 6c3da842 1d Initial commit on main
βšͺ Showing 6 worktrees, 2 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_check.snap b/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_check.snap
index f32d86fe7..de4f72d44 100644
--- a/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_check.snap
+++ b/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_check.snap
@@ -24,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEADΒ± main↕ Path Remoteβ‡… Commit Age Message
-@ main ^ ./repo [SHA] 1d Initial commit
-+ test +!? +1 -1 ./repo.test [SHA] 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ test +!? +1 -1 ./repo.test b834638e 1d Initial commit
βšͺ Showing 2 worktrees, 1 with changes
diff --git a/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_width_consistency.snap b/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_width_consistency.snap
index f2001fe17..6e29fc543 100644
--- a/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_width_consistency.snap
+++ b/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_width_consistency.snap
@@ -24,8 +24,8 @@ exit_code: 0
----- stderr -----
Branch Status HEADΒ± main↕ Path Remoteβ‡… Commit Age Message
-@ main ^ ./repo [SHA] 1d Initial commit
-+ complex !? +1 -1 ./repo.complex [SHA] 1d Initial commit
-+ simple + ? +1 -1 ./repo.simple [SHA] 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ complex !? +1 -1 ./repo.complex b834638e 1d Initial commit
++ simple + ? +1 -1 ./repo.simple b834638e 1d Initial commit
βšͺ Showing 3 worktrees, 2 with changes
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_branches_enabled.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_branches_enabled.snap
index b0b31f818..c1b791dd6 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_branches_enabled.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_branches_enabled.snap
@@ -26,6 +26,6 @@ exit_code: 0
----- stderr -----
Branch Status HEADΒ± main↕ Path Remoteβ‡… Commit Age Message
-@ main ^ . [SHA] 1d Initial commit
+@ main ^ . b834638e 1d Initial commit
βšͺ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snap
index fb531d853..436587b0d 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snap
@@ -27,7 +27,7 @@ exit_code: 0
----- stderr -----
Branch Status HEADΒ± main↕ Path Remoteβ‡… Commit Age Message
-@ main ^ . [SHA] 1d Initial commit
- feature _ βŽ‡ [SHA] 1d Initial commit
+@ main ^ . b834638e 1d Initial commit
+ feature _ βŽ‡ b834638e 1d Initial commit
βšͺ Showing 1 worktrees, 1 branches
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_full_and_branches.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_full_and_branches.snap
index b0b31f818..c1b791dd6 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_full_and_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_full_and_branches.snap
@@ -26,6 +26,6 @@ exit_code: 0
----- stderr -----
Branch Status HEADΒ± main↕ Path Remoteβ‡… Commit Age Message
-@ main ^ . [SHA] 1d Initial commit
+@ main ^ . b834638e 1d Initial commit
βšͺ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_full_enabled.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_full_enabled.snap
index b0b31f818..c1b791dd6 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_full_enabled.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_full_enabled.snap
@@ -26,6 +26,6 @@ exit_code: 0
----- stderr -----
Branch Status HEADΒ± main↕ Path Remoteβ‡… Commit Age Message
-@ main ^ . [SHA] 1d Initial commit
+@ main ^ . b834638e 1d Initial commit
βšͺ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_no_config.snap b/tests/snapshots/integration__integration_tests__list_config__list_no_config.snap
index b0b31f818..c1b791dd6 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_no_config.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_no_config.snap
@@ -26,6 +26,6 @@ exit_code: 0
----- stderr -----
Branch Status HEADΒ± main↕ Path Remoteβ‡… Commit Age Message
-@ main ^ . [SHA] 1d Initial commit
+@ main ^ . b834638e 1d Initial commit
βšͺ Showing 1 worktree
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 3e4899a83..cb6cbcaa9 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
@@ -23,16 +23,16 @@ success: true
exit_code: 0
----- stdout -----
πŸ”„ Squashing 2 commits & working tree changes into a single commit (2 files, +2)...
-πŸ’‘ Backup created @ [SHA]
+πŸ’‘ Backup created @ 330ccd6
πŸ”„ Generating squash commit message...
-βœ… Squashed @ [SHA]
-πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
+βœ… Squashed @ b54183b
+πŸ”„ Merging 1 commit to main @ b54183b (no rebase needed)
βœ… Merged to main (1 commit, 2 files, +2)
πŸ”„ Removing feature worktree & branch in background
----- stderr -----
  fix: update file 1 content
-  * [SHA] fix: update file 1 content
+  * b54183b fix: update file 1 content
  file1.txt | 1 +
  file2.txt | 1 +
  2 files changed, 2 insertions(+)
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 f2716b7b4..97d5c96f6 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
@@ -23,11 +23,11 @@ success: true
exit_code: 0
----- stdout -----
πŸ”„ Squashing 1 commit & working tree changes into a single commit (1 file, +1)...
-πŸ’‘ Backup created @ [SHA]
+πŸ’‘ Backup created @ b18c23e
πŸ”„ Generating squash commit message...
πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
-βœ… Squashed @ [SHA]
-πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
+βœ… Squashed @ d118927
+πŸ”„ Merging 1 commit to main @ d118927 (no rebase needed)
βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature worktree & branch in background
@@ -36,6 +36,6 @@ exit_code: 0
 
  Combined commits:
  - feat: initial feature
-  * [SHA] Squash commits from main
+  * d118927 Squash commits from main
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
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 e2110dbf1..d54126afb 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
@@ -23,15 +23,15 @@ success: true
exit_code: 0
----- stdout -----
πŸ”„ Squashing 1 commit & working tree changes into a single commit (1 file, +1)...
-πŸ’‘ Backup created @ [SHA]
+πŸ’‘ Backup created @ 967330a
πŸ”„ Generating squash commit message...
-βœ… Squashed @ [SHA]
-πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
+βœ… Squashed @ 1e3993e
+πŸ”„ Merging 1 commit to main @ 1e3993e (no rebase needed)
βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature worktree & branch in background
----- stderr -----
  fix: improve auth validation logic
-  * [SHA] fix: improve auth validation logic
+  * 1e3993e fix: improve auth validation logic
  auth.txt | 1 +
  1 file changed, 1 insertion(+)
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 dee7ae897..6e1a5393a 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
@@ -25,14 +25,14 @@ exit_code: 0
🟑 Auto-staging 1 untracked file:
πŸ”„ Committing changes with default message... (1 file, +1, no squashing needed)
πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
-βœ… Committed changes @ [SHA]
-πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
+βœ… Committed changes @ c1126ec
+πŸ”„ Merging 1 commit to main @ c1126ec (no rebase needed)
βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature worktree & branch in background
----- stderr -----
  dirty.txt
  Changes to dirty.txt
-  * [SHA] Changes to dirty.txt
+  * c1126ec Changes to dirty.txt
  dirty.txt | 1 +
  1 file changed, 1 insertion(+)
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 121a89398..075fd5a11 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
@@ -22,11 +22,11 @@ info:
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature worktree & branch in background
----- stderr -----
-  * [SHA] Add feature file
+  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commit_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commit_not_fast_forward.snap
index 89e3885b8..eb2802379 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_commit_not_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_commit_not_fast_forward.snap
@@ -27,6 +27,6 @@ exit_code: 1
----- stderr -----
❌ Can't push to local main branch: it has newer commits
-  * [SHA] Add main file
+  * fb975b3 Add main file
πŸ’‘ Run 'wt merge' again to incorporate these changes
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 97a2f2b87..9925d1504 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
@@ -25,14 +25,14 @@ exit_code: 0
🟑 Auto-staging 1 untracked file:
πŸ”„ Committing changes with default message... (1 file, +1, no squashing needed)
πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
-βœ… Committed changes @ [SHA]
-πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
+βœ… Committed changes @ 96ddfbc
+πŸ”„ Merging 1 commit to main @ 96ddfbc (no rebase needed)
βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing no-commits-dirty worktree & branch in background
----- stderr -----
  newfile.txt
  Changes to newfile.txt
-  * [SHA] Changes to newfile.txt
+  * 96ddfbc Changes to newfile.txt
  newfile.txt | 1 +
  1 file changed, 1 insertion(+)
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 ecacd8573..6d222a534 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap
@@ -21,11 +21,11 @@ info:
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature worktree & branch in background
----- stderr -----
-  * [SHA] Add feature file
+  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
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 48f3dfb7c..3c74efd69 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
@@ -23,13 +23,13 @@ info:
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 2 commits to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ Merging 2 commits to main @ bf212d3 (no commit/squash/rebase needed)
βœ… Merged to main (2 commits, 2 files, +2)
πŸ”„ Removing feature worktree & branch in background
----- stderr -----
-  * [SHA] feat: add file 2
-  * [SHA] feat: add file 1
+  * bf212d3 feat: add file 2
+  * 123e46c feat: add file 1
  file1.txt | 1 +
  file2.txt | 1 +
  2 files changed, 2 insertions(+)
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 121a89398..e7c334677 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
@@ -22,11 +22,11 @@ info:
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 4af48f0 (no commit/squash/rebase needed)
βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature worktree & branch in background
----- stderr -----
-  * [SHA] Add feature file
+  * 4af48f0 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
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 bbbfba0de..6913cc7af 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
@@ -23,14 +23,14 @@ info:
success: false
exit_code: 1
----- stdout -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ cdb002e (no commit/squash/rebase needed)
βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature worktree & branch in background
πŸ”„ Running post-merge:
🟑 Command failed: exit status: 1
----- stderr -----
-  * [SHA] Add feature file
+  * cdb002e Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
  exit 1
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap
index 8221376d0..3977550a3 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
@@ -23,14 +23,14 @@ info:
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 8609b84 (no commit/squash/rebase needed)
βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature worktree & branch in background
πŸ”„ Running post-merge notify:
πŸ”„ Running post-merge deploy:
----- stderr -----
-  * [SHA] Add feature file
+  * 8609b84 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
  echo 'Merge to main complete' > notify.txt
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 de5599e2f..fb4dcff01 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
@@ -24,11 +24,11 @@ info:
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 72ff5fc (no commit/squash/rebase needed)
βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature worktree & branch in background
----- stderr -----
-  * [SHA] Add feature file
+  * 72ff5fc Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
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 5b5e9a827..a1209117d 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
@@ -23,13 +23,13 @@ info:
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 72ff5fc (no commit/squash/rebase needed)
βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature worktree & branch in background
πŸ”„ Running post-merge:
----- stderr -----
-  * [SHA] Add feature file
+  * 72ff5fc Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
  echo 'merged feature to main' > 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 716890c56..f5366bf05 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
@@ -27,8 +27,8 @@ exit_code: 0
πŸ”„ Running pre-commit:
πŸ”„ Committing changes with default message... (1 file, +1, no squashing needed)
πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
-βœ… Committed changes @ [SHA]
-πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
+βœ… Committed changes @ cdc8f90
+πŸ”„ Merging 1 commit to main @ cdc8f90 (no rebase needed)
βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature worktree & branch in background
@@ -37,6 +37,6 @@ exit_code: 0
  echo 'Pre-commit check passed'
Pre-commit check passed
  Changes to feature.txt
-  * [SHA] Changes to feature.txt
+  * cdc8f90 Changes to feature.txt
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
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 256812169..0150daf74 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
@@ -26,7 +26,7 @@ exit_code: 0
πŸ”„ Running pre-merge format:
πŸ”„ Running pre-merge lint:
πŸ”„ Running pre-merge test:
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 2cbe2a2 (no commit/squash/rebase needed)
βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature worktree & branch in background
@@ -34,6 +34,6 @@ exit_code: 0
  exit 0
  exit 0
  exit 0
-  * [SHA] Add feature file
+  * 2cbe2a2 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
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 f0e239890..7182b6d20 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
@@ -24,12 +24,12 @@ success: true
exit_code: 0
----- stdout -----
πŸ”„ Running pre-merge:
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 4b1199c (no commit/squash/rebase needed)
βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature worktree & branch in background
----- stderr -----
  exit 0
-  * [SHA] Add feature file
+  * 4b1199c Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
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 52c31f16d..e152bf81a 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
@@ -24,13 +24,13 @@ success: true
exit_code: 0
----- stdout -----
πŸ”„ Running pre-commit:
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 726717f (no commit/squash/rebase needed)
βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature worktree & branch in background
----- stderr -----
  echo 'Pre-commit check passed'
Pre-commit check passed
-  * [SHA] Add feature file
+  * 726717f Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
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 d86a9cf8d..704519534 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
@@ -22,11 +22,11 @@ info:
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature-from-develop worktree & branch in background
----- stderr -----
-  * [SHA] Add feature file
+  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
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 62487973f..844ec251f 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
@@ -24,11 +24,11 @@ exit_code: 0
----- stdout -----
πŸ”„ Rebasing onto main...
βœ… Rebased onto main
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash needed)
+πŸ”„ Merging 1 commit to main @ 76778cc (no commit/squash needed)
βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature-dirty-primary worktree & branch in background
----- stderr -----
-  * [SHA] Add feature file
+  * 76778cc Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap b/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap
index eb95a78be..100f8b0f7 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap
@@ -23,11 +23,11 @@ info:
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
βœ… Merged to main (1 commit, 1 file, +1)
βšͺ Worktree preserved (--no-remove)
----- stderr -----
-  * [SHA] Add feature file
+  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap
index 1c6233951..0752ac4b9 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap
@@ -27,7 +27,7 @@ exit_code: 1
----- stderr -----
❌ Rebase onto main incomplete
  Rebasing (1/1)
-  error: could not apply [SHA]... Update shared.txt in feature
-  Could not apply [SHA]... # Update shared.txt in feature
+  error: could not apply c661874... Update shared.txt in feature
+  Could not apply c661874... # Update shared.txt in feature
  Auto-merging shared.txt
  CONFLICT (content): Merge conflict in shared.txt
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 6c5ed801f..38d54f71d 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
@@ -24,11 +24,11 @@ exit_code: 0
----- stdout -----
πŸ”„ Rebasing onto main...
βœ… Rebased onto main
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash needed)
+πŸ”„ Merging 1 commit to main @ ae48a8e (no commit/squash needed)
βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing true-rebase-test worktree & branch in background
----- stderr -----
-  * [SHA] Add feature
+  * ae48a8e Add feature
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
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 f2b813283..9473555b9 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
@@ -25,8 +25,8 @@ exit_code: 0
πŸ”„ Squashing 3 commits into a single commit (3 files, +3)...
πŸ”„ Generating squash commit message...
πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
-βœ… Squashed @ [SHA]
-πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
+βœ… Squashed @ 27eb169
+πŸ”„ Merging 1 commit to main @ 27eb169 (no rebase needed)
βœ… Merged to main (1 commit, 3 files, +3)
πŸ”„ Removing feature worktree & branch in background
@@ -37,7 +37,7 @@ exit_code: 0
  - feat: add file 1
  - fix: update logic
  - docs: update readme
-  * [SHA] Squash commits from main
+  * 27eb169 Squash commits from main
  file1.txt | 1 +
  file2.txt | 1 +
  file3.txt | 1 +
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 0d3db0dcb..a50b17335 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
@@ -26,8 +26,8 @@ exit_code: 0
πŸ”„ Squashing 2 commits into a single commit (2 files, +2)...
πŸ”„ Generating squash commit message...
πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
-βœ… Squashed @ [SHA]
-πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
+βœ… Squashed @ 091f0c5
+πŸ”„ Merging 1 commit to main @ 091f0c5 (no rebase needed)
βœ… Merged to main (1 commit, 2 files, +2)
πŸ”„ Removing feature worktree & branch in background
@@ -37,7 +37,7 @@ exit_code: 0
  Combined commits:
  - feat: new feature
  - fix: bug fix
-  * [SHA] Squash commits from main
+  * 091f0c5 Squash commits from main
  file1.txt | 1 +
  file2.txt | 1 +
  2 files changed, 2 insertions(+)
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 e55911d7a..3f139ec4d 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
@@ -22,11 +22,11 @@ info:
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 525a81f (no commit/squash/rebase needed)
βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature worktree & branch in background
----- stderr -----
-  * [SHA] feat: single commit
+  * 525a81f feat: single commit
  file1.txt | 1 +
  1 file changed, 1 insertion(+)
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 bcc23b707..74b53fc84 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
@@ -24,13 +24,13 @@ exit_code: 0
----- stdout -----
πŸ”„ Squashing 2 commits into a single commit (1 file, +1)...
πŸ”„ Generating squash commit message...
-βœ… Squashed @ [SHA]
-πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
+βœ… Squashed @ d42412f
+πŸ”„ Merging 1 commit to main @ d42412f (no rebase needed)
βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature worktree & branch in background
----- stderr -----
  feat: implement user authentication system
-  * [SHA] feat: implement user authentication system
+  * d42412f feat: implement user authentication system
  auth.txt | 1 +
  1 file changed, 1 insertion(+)
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 22caa3ef3..c03edb5fc 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
@@ -25,11 +25,11 @@ success: true
exit_code: 0
----- stdout -----
πŸ”„ Squashing 2 commits & working tree changes into a single commit (2 files, +2)...
-πŸ’‘ Backup created @ [SHA]
+πŸ’‘ Backup created @ 330ccd6
πŸ”„ Generating squash commit message...
πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
-βœ… Squashed @ [SHA]
-πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
+βœ… Squashed @ d34e4c3
+πŸ”„ Merging 1 commit to main @ d34e4c3 (no rebase needed)
βœ… Merged to main (1 commit, 2 files, +2)
πŸ”„ Removing feature worktree & branch in background
@@ -39,7 +39,7 @@ exit_code: 0
  Combined commits:
  - feat: add file 1
  - feat: add file 2
-  * [SHA] Squash commits from main
+  * d34e4c3 Squash commits from main
  file1.txt | 1 +
  file2.txt | 1 +
  2 files changed, 2 insertions(+)
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 ecacd8573..6d222a534 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
@@ -21,11 +21,11 @@ info:
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature worktree & branch in background
----- stderr -----
-  * [SHA] Add feature file
+  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
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 1d8508145..439d24f5f 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
@@ -24,11 +24,11 @@ exit_code: 0
----- stdout -----
πŸ”„ Rebasing onto staging...
βœ… Rebased onto staging
-πŸ”„ Merging 1 commit to staging @ [SHA] (no commit/squash needed)
+πŸ”„ Merging 1 commit to staging @ 8280b9e (no commit/squash needed)
βœ… Merged to staging (1 commit, 1 file, +1)
πŸ”„ Removing feature-for-staging worktree & branch in background
----- stderr -----
-  * [SHA] Add feature for staging
+  * 8280b9e Add feature for staging
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
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 121a89398..075fd5a11 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
@@ -22,11 +22,11 @@ info:
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature worktree & branch in background
----- stderr -----
-  * [SHA] Add feature file
+  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
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 2a76adda3..f78a53a97 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap
@@ -22,11 +22,11 @@ info:
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature worktree & branch in background
----- stderr -----
-  * [SHA] Add feature file
+  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap
index eb95a78be..100f8b0f7 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap
@@ -23,11 +23,11 @@ info:
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
βœ… Merged to main (1 commit, 1 file, +1)
βšͺ Worktree preserved (--no-remove)
----- stderr -----
-  * [SHA] Add feature file
+  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
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 ae3705360..4f9043ce2 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
@@ -26,11 +26,11 @@ exit_code: 0
----- stdout -----
🟑 Auto-staging 2 untracked files:
πŸ”„ Squashing 1 commit & working tree changes into a single commit (3 files, +3)...
-πŸ’‘ Backup created @ [SHA]
+πŸ’‘ Backup created @ 4967998
πŸ”„ Generating squash commit message...
πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
-βœ… Squashed @ [SHA]
-πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
+βœ… Squashed @ fbfc726
+πŸ”„ Merging 1 commit to main @ fbfc726 (no rebase needed)
βœ… Merged to main (1 commit, 3 files, +3)
πŸ”„ Removing feature worktree & branch in background
@@ -41,7 +41,7 @@ exit_code: 0
 
  Combined commits:
  - feat: add file 1
-  * [SHA] Squash commits from main
+  * fbfc726 Squash commits from main
  file1.txt | 1 +
  untracked1.txt | 1 +
  untracked2.txt | 1 +
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 44cb6507e..52937f313 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
@@ -26,10 +26,10 @@ exit_code: 0
----- stdout -----
πŸ”„ Squashing 3 commits into a single commit (3 files, +33)...
πŸ”„ Generating squash commit message...
-βœ… Squashed @ [SHA]
+βœ… Squashed @ 95c3316
πŸ”„ Running pre-merge test:
πŸ”„ Running pre-merge lint:
-πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
+πŸ”„ Merging 1 commit to main @ 95c3316 (no rebase needed)
βœ… Merged to main (1 commit, 3 files, +33)
πŸ”„ Removing feature-auth worktree & branch in background
πŸ”„ Running post-merge install:
@@ -58,7 +58,7 @@ test result: ok. 18 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; fin
  cargo clippy
 Checking worktrunk v0.1.0
Finished dev [unoptimized + debuginfo] target(s) in 1.23s
-  * [SHA] feat(auth): Implement JWT authentication system
+  * 95c3316 feat(auth): Implement JWT authentication system
  auth.rs | 8 ++++++++
  auth_test.rs | 17 +++++++++++++++++
  jwt.rs | 8 ++++++++
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 ae22f8506..3b2173e5a 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
@@ -26,10 +26,10 @@ exit_code: 0
----- stdout -----
πŸ”„ Squashing 3 commits into a single commit (2 files, +45)...
πŸ”„ Generating squash commit message...
-βœ… Squashed @ [SHA]
+βœ… Squashed @ 69200cc
πŸ”„ Running pre-merge test:
πŸ”„ Running pre-merge lint:
-πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
+πŸ”„ Merging 1 commit to main @ 69200cc (no rebase needed)
βœ… Merged to main (1 commit, 2 files, +45)
πŸ”„ Removing feature-auth worktree & branch in background
@@ -53,7 +53,7 @@ tests/test_auth.py::test_token_validation PASSED [100%]

All checks passed!
-  * [SHA] feat(api): Add user authentication endpoints
+  * 69200cc feat(api): Add user authentication endpoints
  api/auth.py | 31 +++++++++++++++++++++++++++++++
  tests/test_auth.py | 14 ++++++++++++++
  2 files changed, 45 insertions(+)
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 420e1d7b6..527ecef0f 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
@@ -22,11 +22,11 @@ info:
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ d29e0fd (no commit/squash/rebase needed)
βœ… Merged to main (1 commit, 1 file, +13)
πŸ”„ Removing fix-auth worktree & branch in background
----- stderr -----
-  * [SHA] Implement JWT validation
+  * d29e0fd Implement JWT validation
  auth.rs | 13 +++++++++++++
  1 file changed, 13 insertions(+)
diff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snap
index d0898fed4..afc2d1035 100644
--- a/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snap
+++ b/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snap
@@ -29,7 +29,7 @@ exit_code: 0
πŸ’‘ Skipping pre-commit hook (--no-verify)
πŸ”„ Committing tracked changes with default message... (1 file, +1, -1)
πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
-βœ… Committed changes @ [SHA]
+βœ… Committed changes @ a5890cb
----- stderr -----
  Changes to tracked.txt
diff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snap
index 1e5f7c309..284813c12 100644
--- a/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snap
+++ b/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snap
@@ -29,7 +29,7 @@ exit_code: 0
🟑 Auto-staging 2 untracked files:
πŸ”„ Committing changes with default message... (2 files, +2)
πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
-βœ… Committed changes @ [SHA]
+βœ… Committed changes @ 3dbcd5d
----- stderr -----
  .config/
diff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_stage_tracked.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_stage_tracked.snap
index 1827abec8..e3f2d3d7e 100644
--- a/tests/snapshots/integration__integration_tests__merge__step_commit_stage_tracked.snap
+++ b/tests/snapshots/integration__integration_tests__merge__step_commit_stage_tracked.snap
@@ -27,7 +27,7 @@ exit_code: 0
----- stdout -----
πŸ”„ Committing tracked changes with default message... (1 file, +1, -1)
πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
-βœ… Committed changes @ [SHA]
+βœ… Committed changes @ 7d441f0
----- stderr -----
  Changes to tracked.txt
diff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snap
index 580d48bf2..c0d4430dc 100644
--- a/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snap
+++ b/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snap
@@ -28,10 +28,10 @@ exit_code: 0
----- stdout -----
πŸ’‘ Skipping pre-commit hook (--no-verify)
πŸ”„ Squashing 2 commits & tracked changes into a single commit (3 files, +3)...
-πŸ’‘ Backup created @ [SHA]
+πŸ’‘ Backup created @ 31e06e8
πŸ”„ Generating squash commit message...
πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
-βœ… Squashed @ [SHA]
+βœ… Squashed @ 9f7a3e2
----- stderr -----
  Squash commits from main
diff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snap
index c5ce27399..ec851961a 100644
--- a/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snap
+++ b/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snap
@@ -29,7 +29,7 @@ exit_code: 0
πŸ”„ Squashing 2 commits into a single commit (3 files, +3)...
πŸ”„ Generating squash commit message...
πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
-βœ… Squashed @ [SHA]
+βœ… Squashed @ 588aa53
----- stderr -----
  Squash commits from main
diff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_stage_tracked.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_stage_tracked.snap
index 4504a08ac..587d34dc3 100644
--- a/tests/snapshots/integration__integration_tests__merge__step_squash_stage_tracked.snap
+++ b/tests/snapshots/integration__integration_tests__merge__step_squash_stage_tracked.snap
@@ -26,10 +26,10 @@ success: true
exit_code: 0
----- stdout -----
πŸ”„ Squashing 2 commits & tracked changes into a single commit (2 files, +2)...
-πŸ’‘ Backup created @ [SHA]
+πŸ’‘ Backup created @ ba1424b
πŸ”„ Generating squash commit message...
πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
-βœ… Squashed @ [SHA]
+βœ… Squashed @ 6c0b38b
----- stderr -----
  Squash commits from main
diff --git a/tests/snapshots/integration__integration_tests__push__push_dirty_target_autostash.snap b/tests/snapshots/integration__integration_tests__push__push_dirty_target_autostash.snap
index 6f27f6889..fdf7f7e49 100644
--- a/tests/snapshots/integration__integration_tests__push__push_dirty_target_autostash.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_dirty_target_autostash.snap
@@ -24,11 +24,11 @@ success: true
exit_code: 0
----- stdout -----
πŸ”„ Stashing changes in [REPO]...
-πŸ”„ Pushing 1 commit to main @ [SHA]
+πŸ”„ Pushing 1 commit to main @ 6551244
πŸ”„ Restoring stashed changes in [REPO]...
βœ… Pushed to main (1 commit, 1 file, +1)
----- stderr -----
-  * [SHA] Add feature file
+  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
diff --git a/tests/snapshots/integration__integration_tests__push__push_error_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_error_not_fast_forward.snap
index ae8fcb24f..753eb029f 100644
--- a/tests/snapshots/integration__integration_tests__push__push_error_not_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_error_not_fast_forward.snap
@@ -26,6 +26,6 @@ exit_code: 1
----- stderr -----
❌ Can't push to local main branch: it has newer commits
-  * [SHA] Main commit
+  * 5ca21c8 Main commit
πŸ’‘ Use 'wt step rebase' or 'wt merge' to rebase onto main
diff --git a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap
index e943f8a66..da650dd39 100644
--- a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap
@@ -23,10 +23,10 @@ info:
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Pushing 1 commit to main @ [SHA]
+πŸ”„ Pushing 1 commit to main @ c2e2bcc
βœ… Pushed to main (1 commit, 1 file, +1)
----- stderr -----
-  * [SHA] Add test file
+  * c2e2bcc Add test file
  test.txt | 1 +
  1 file changed, 1 insertion(+)
diff --git a/tests/snapshots/integration__integration_tests__push__push_no_remote.snap b/tests/snapshots/integration__integration_tests__push__push_no_remote.snap
index f86400927..5d92c8094 100644
--- a/tests/snapshots/integration__integration_tests__push__push_no_remote.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_no_remote.snap
@@ -22,10 +22,10 @@ info:
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Pushing 1 commit to main @ [SHA]
+πŸ”„ Pushing 1 commit to main @ 6551244
βœ… Pushed to main (1 commit, 1 file, +1)
----- stderr -----
-  * [SHA] Add feature file
+  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
diff --git a/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap
index 059163a91..bd67b292f 100644
--- a/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap
@@ -23,10 +23,10 @@ info:
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Pushing 1 commit to main @ [SHA]
+πŸ”„ Pushing 1 commit to main @ 4af48f0
βœ… Pushed to main (1 commit, 1 file, +1)
----- stderr -----
-  * [SHA] Add feature file
+  * 4af48f0 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
diff --git a/tests/snapshots/integration__integration_tests__push__push_to_default.snap b/tests/snapshots/integration__integration_tests__push__push_to_default.snap
index f86400927..5d92c8094 100644
--- a/tests/snapshots/integration__integration_tests__push__push_to_default.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_to_default.snap
@@ -22,10 +22,10 @@ info:
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Pushing 1 commit to main @ [SHA]
+πŸ”„ Pushing 1 commit to main @ 6551244
βœ… Pushed to main (1 commit, 1 file, +1)
----- stderr -----
-  * [SHA] Add feature file
+  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
diff --git a/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap b/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap
index 7b4cdb9a2..65be3aa7d 100644
--- a/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap
@@ -24,15 +24,15 @@ info:
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Pushing 3 commits to main @ [SHA] (merge commits allowed)
+πŸ”„ Pushing 3 commits to main @ 13bed7b (merge commits allowed)
βœ… Pushed to main (3 commits, 2 files, +2)
----- stderr -----
-  * [SHA] Merge temp
+  * 13bed7b Merge temp
  |/
-  | * [SHA] Commit 2
+  | * 1f38fab Commit 2
  |/
-  * [SHA] Commit 1
+  * a184b7f Commit 1
  file1.txt | 1 +
  file2.txt | 1 +
  2 files changed, 2 insertions(+)
diff --git a/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snap b/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snap
index fbc3aa4f7..470b2bf1b 100644
--- a/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snap
+++ b/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snap
@@ -24,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEADΒ± main↕ Path Remoteβ‡… Commit Age Message
-@ main ^ ./repo [SHA] 1d Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
-+ feature _ ./repo.feature [SHA] 1d Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
+@ main ^ ./repo 584d9a09 1d Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
++ feature _ ./repo.feature 584d9a09 1d Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
βšͺ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__security__path_with_directive_not_executed.snap b/tests/snapshots/integration__integration_tests__security__path_with_directive_not_executed.snap
index 11b99f453..5dacfa1cd 100644
--- a/tests/snapshots/integration__integration_tests__security__path_with_directive_not_executed.snap
+++ b/tests/snapshots/integration__integration_tests__security__path_with_directive_not_executed.snap
@@ -24,6 +24,6 @@ exit_code: 0
----- stderr -----
Branch Status HEADΒ± main↕ Path Remoteβ‡… Commit Age Message
-@ main ^ . [SHA] 1d Initial commit
+@ main ^ . b834638e 1d Initial commit
βšͺ Showing 1 worktree