Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Run wt hook pre-merge on Windows in CI (#146)
Maximilian Roosb48b0ba759f0
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yamlindex 3866db375..e4da2910d 100644--- a/.github/workflows/ci.yaml+++ b/.github/workflows/ci.yaml@@ -74,30 +74,21 @@ jobs:# Skip lychee on Windows/macOS - it requires bash and we only need to run it onceSKIP: ${{ runner.os != 'Linux' && 'lychee' || '' }}- # This installs from crates.io, not from the PR code. Pre-merge hooks- # run against the published version, testing the hook configuration.- - name: Install wt+ # On Linux/macOS: Install from crates.io (pre-merge hooks run against published version)+ # On Windows: Build from source (published version may not have Git Bash detection fixes)+ - name: Install wt (Linux/macOS)if: runner.os != 'Windows'uses: baptiste0928/cargo-install@v3with:crate: worktrunk+ - name: Install wt (Windows - from source)+ if: runner.os == 'Windows'+ run: cargo install --path .+- name: 🧪 Pre-merge hooks- if: runner.os != 'Windows'run: wt hook pre-merge --force- # Windows: Run tests directly (wt hook pre-merge uses bash syntax).- # Same test command as wt.toml pre-merge config.- - name: 🧪 Tests (Windows)- if: runner.os == 'Windows'- run: |- cargo insta test --dnd --check --features shell-integration-tests- cargo test --doc- env:- RUSTFLAGS: '-D warnings'- NEXTEST_STATUS_LEVEL: fail- NEXTEST_SUCCESS_OUTPUT: never-# Check if Cargo files changed (for conditional jobs below)changes:runs-on: ubuntu-latestdiff --git a/src/shell_exec.rs b/src/shell_exec.rsindex 46f55f2da..e83d01637 100644--- a/src/shell_exec.rs+++ b/src/shell_exec.rs@@ -126,22 +126,41 @@ fn detect_windows_shell() -> ShellConfig {/// Find Git Bash executable on Windows///-/// Checks:-/// 1. MSYSTEM environment variable (indicates running in Git Bash/MSYS2)+/// Detection order (designed to always return absolute paths and avoid WSL):+/// 1. `git.exe` in PATH - derive bash.exe location from Git installation/// 2. Standard Git for Windows and MSYS2 installation paths-/// 3. `git.exe` in PATH to find Git installation directory+///+/// We explicitly avoid `which bash` because on systems with WSL installed,+/// `C:\Windows\System32\bash.exe` (WSL launcher) often comes before Git Bash+/// in PATH, even when MSYSTEM is set.#[cfg(windows)]fn find_git_bash() -> Option<PathBuf> {- // If we're already in Git Bash/MSYS2 (MSYSTEM is set), bash should be in PATH- if std::env::var("MSYSTEM").is_ok() && which::which("bash").is_ok() {- return Some(PathBuf::from("bash"));+ // Primary method: Find Git installation via `git.exe` in PATH+ // This is the most reliable method and always returns an absolute path.+ // Works on CI systems like GitHub Actions where Git might be in non-standard locations.+ if let Ok(git_path) = which::which("git") {+ // git.exe is typically at Git/cmd/git.exe or Git/bin/git.exe+ // bash.exe is at Git/bin/bash.exe or Git/usr/bin/bash.exe+ if let Some(git_dir) = git_path.parent().and_then(|p| p.parent()) {+ // Try bin/bash.exe first (most common)+ let bash_path = git_dir.join("bin").join("bash.exe");+ if bash_path.exists() {+ return Some(bash_path);+ }+ // Also try usr/bin/bash.exe (some Git for Windows layouts)+ let bash_path = git_dir.join("usr").join("bin").join("bash.exe");+ if bash_path.exists() {+ return Some(bash_path);+ }+ }}- // Check standard installation paths for bash.exe+ // Fallback: Check standard installation paths for bash.exe// (Git for Windows and MSYS2 both provide POSIX-compatible bash)let bash_paths = [// Git for Windowsr"C:\Program Files\Git\bin\bash.exe",+ r"C:\Program Files\Git\usr\bin\bash.exe",r"C:\Program Files (x86)\Git\bin\bash.exe",r"C:\Git\bin\bash.exe",// MSYS2 standalone (popular alternative to Git Bash)@@ -156,18 +175,6 @@ fn find_git_bash() -> Option<PathBuf> {}}- // Try to find Git installation via `git.exe` in PATH- if let Ok(git_path) = which::which("git") {- // git.exe is typically at Git/cmd/git.exe or Git/bin/git.exe- // bash.exe is at Git/bin/bash.exe- if let Some(git_dir) = git_path.parent().and_then(|p| p.parent()) {- let bash_path = git_dir.join("bin").join("bash.exe");- if bash_path.exists() {- return Some(bash_path);- }- }- }-None}@@ -205,8 +212,17 @@ mod tests {.command("echo hello").output().expect("Failed to execute shell command");- assert!(output.status.success(), "echo should succeed");let stdout = String::from_utf8_lossy(&output.stdout);+ let stderr = String::from_utf8_lossy(&output.stderr);+ assert!(+ output.status.success(),+ "echo should succeed. Shell: {} ({:?}), exit: {:?}, stdout: '{}', stderr: '{}'",+ config.name,+ config.executable,+ output.status.code(),+ stdout.trim(),+ stderr.trim()+ );assert!(stdout.contains("hello"),"stdout should contain 'hello', got: '{}'",@@ -263,8 +279,17 @@ mod tests {.output().expect("Failed to execute echo");- assert!(output.status.success(), "echo should succeed");let stdout = String::from_utf8_lossy(&output.stdout);+ let stderr = String::from_utf8_lossy(&output.stderr);+ assert!(+ output.status.success(),+ "echo should succeed. Shell: {} ({:?}), exit: {:?}, stdout: '{}', stderr: '{}'",+ config.name,+ config.executable,+ output.status.code(),+ stdout.trim(),+ stderr.trim()+ );assert!(stdout.contains("test_output"),"stdout should contain 'test_output', got: '{}'",@@ -283,11 +308,17 @@ mod tests {.output().expect("Failed to execute redirection test");+ let stdout = String::from_utf8_lossy(&output.stdout);+ let stderr = String::from_utf8_lossy(&output.stderr);assert!(output.status.success(),- "redirection command should succeed"+ "redirection command should succeed. Shell: {} ({:?}), exit: {:?}, stdout: '{}', stderr: '{}'",+ config.name,+ config.executable,+ output.status.code(),+ stdout.trim(),+ stderr.trim());- let stderr = String::from_utf8_lossy(&output.stderr);assert!(stderr.contains("redirected"),"stderr should contain 'redirected' (stdout redirected to stderr), got: '{}'",diff --git a/tests/integration_tests/approval_ui.rs b/tests/integration_tests/approval_ui.rsindex a5cb67f42..460335427 100644--- a/tests/integration_tests/approval_ui.rs+++ b/tests/integration_tests/approval_ui.rs@@ -113,6 +113,8 @@ approved-commands = ["echo 'Second command'"]);}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_force_flag_does_not_save_approvals() {let repo = TestRepo::new();@@ -152,6 +154,8 @@ fn test_force_flag_does_not_save_approvals() {);}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_already_approved_commands_skip_prompt() {let repo = TestRepo::new();@@ -339,6 +343,8 @@ fn test_approval_fails_in_non_tty() {/// Test that --force flag bypasses TTY requirement////// Even in non-TTY environments, --force should allow commands to execute.+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_force_bypasses_tty_check() {let repo = TestRepo::new();@@ -365,6 +371,8 @@ fn test_force_bypasses_tty_check() {/// When `wt hook post-merge` runs standalone (not via `wt merge`), the `{{ target }}`/// variable should be the current branch, not always the default branch./// This allows hooks to behave correctly when testing from feature worktrees.+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_hook_post_merge_target_is_current_branch() {let repo = TestRepo::new();@@ -405,6 +413,8 @@ fn test_hook_post_merge_target_is_current_branch() {}/// Test that `{{ target }}` is the current branch for pre-merge standalone+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_hook_pre_merge_target_is_current_branch() {let repo = TestRepo::new();@@ -445,6 +455,8 @@ fn test_hook_pre_merge_target_is_current_branch() {}/// Test running a specific named hook command+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_step_hook_run_named_command() {let repo = TestRepo::new();@@ -536,6 +548,8 @@ fn test_step_hook_name_filter_on_unnamed_command() {}/// Test running all hooks (no name filter) still works+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_step_hook_run_all_commands() {let repo = TestRepo::new();diff --git a/tests/integration_tests/for_each.rs b/tests/integration_tests/for_each.rsindex 92de8eea4..06bfe5e11 100644--- a/tests/integration_tests/for_each.rs+++ b/tests/integration_tests/for_each.rs@@ -19,6 +19,8 @@ fn setup_repo() -> TestRepo {repo}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_for_each_single_worktree() {let repo = setup_repo();@@ -31,6 +33,8 @@ fn test_for_each_single_worktree() {);}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_for_each_multiple_worktrees() {let mut repo = setup_repo();@@ -46,6 +50,8 @@ fn test_for_each_multiple_worktrees() {);}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_for_each_command_fails_in_one() {let mut repo = setup_repo();@@ -68,6 +74,8 @@ fn test_for_each_no_args_error() {snapshot_for_each("for_each_no_args", &repo, &["for-each"]);}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_for_each_with_detached_head() {let mut repo = setup_repo();@@ -83,6 +91,8 @@ fn test_for_each_with_detached_head() {);}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_for_each_with_template() {let repo = setup_repo();diff --git a/tests/integration_tests/merge.rs b/tests/integration_tests/merge.rsindex 0820aa9b9..1a468727e 100644--- a/tests/integration_tests/merge.rs+++ b/tests/integration_tests/merge.rs@@ -1013,6 +1013,8 @@ fn test_merge_with_untracked_files() {);}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_merge_pre_merge_command_success() {let mut repo = TestRepo::new();@@ -1061,6 +1063,8 @@ fn test_merge_pre_merge_command_success() {);}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_merge_pre_merge_command_failure() {let mut repo = TestRepo::new();@@ -1157,6 +1161,8 @@ fn test_merge_pre_merge_command_no_hooks() {);}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_merge_pre_merge_command_named() {let mut repo = TestRepo::new();@@ -1214,6 +1220,8 @@ test = "exit 0");}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_merge_post_merge_command_success() {let mut repo = TestRepo::new();@@ -1338,6 +1346,8 @@ fn test_merge_post_merge_command_skipped_with_no_verify() {);}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_merge_post_merge_command_failure() {let mut repo = TestRepo::new();@@ -1386,6 +1396,8 @@ fn test_merge_post_merge_command_failure() {);}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_merge_post_merge_command_named() {let mut repo = TestRepo::new();@@ -1454,6 +1466,8 @@ deploy = "echo 'Deploying branch {{ branch }}' > deploy.txt");}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_merge_post_merge_runs_with_nothing_to_merge() {// Verify post-merge hooks run even when there's nothing to merge@@ -1499,6 +1513,8 @@ fn test_merge_post_merge_runs_with_nothing_to_merge() {);}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_merge_post_merge_runs_from_main_branch() {// Verify post-merge hooks run when merging from main to main (nothing to do)@@ -1532,6 +1548,8 @@ fn test_merge_post_merge_runs_from_main_branch() {);}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_merge_pre_commit_command_success() {let mut repo = TestRepo::new();@@ -1570,6 +1588,8 @@ fn test_merge_pre_commit_command_success() {);}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_merge_pre_commit_command_failure() {let mut repo = TestRepo::new();@@ -1604,6 +1624,8 @@ fn test_merge_pre_commit_command_failure() {);}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_merge_pre_squash_command_success() {let mut repo = TestRepo::new();@@ -1656,6 +1678,8 @@ fn test_merge_pre_squash_command_success() {);}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_merge_pre_squash_command_failure() {let mut repo = TestRepo::new();diff --git a/tests/integration_tests/post_start_commands.rs b/tests/integration_tests/post_start_commands.rsindex 865d27026..a3f0fc57d 100644--- a/tests/integration_tests/post_start_commands.rs+++ b/tests/integration_tests/post_start_commands.rs@@ -45,6 +45,8 @@ fn test_post_create_no_config() {snapshot_switch("post_create_no_config", &repo, &["--create", "feature"]);}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_post_create_single_command() {let repo = TestRepo::new();@@ -72,6 +74,8 @@ approved-commands = ["echo 'Setup complete'"]);}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_post_create_named_commands() {let repo = TestRepo::new();@@ -107,6 +111,8 @@ approved-commands = [);}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_post_create_failing_command() {let repo = TestRepo::new();@@ -134,6 +140,8 @@ approved-commands = ["exit 1"]);}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_post_create_template_expansion() {let repo = TestRepo::new();@@ -201,6 +209,8 @@ approved-commands = [);}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_post_create_default_branch_template() {let repo = TestRepo::new();@@ -246,6 +256,8 @@ approved-commands = ["echo 'Default: {{ default_branch }}' > default.txt"]);}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_post_create_git_variables_template() {let mut repo = TestRepo::new();@@ -322,6 +334,8 @@ worktree_name = "echo 'Worktree Name: {{ worktree_name }}' >> git_vars.txt");}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_post_create_upstream_template() {let mut repo = TestRepo::new();@@ -365,6 +379,8 @@ fn test_post_create_upstream_template() {}/// Test that hooks receive JSON context on stdin+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_post_create_json_stdin() {use crate::common::wt_command;@@ -617,6 +633,8 @@ approved-commands = ["cat > context.json"]// Post-Start Command Tests (parallel, background)// ============================================================================+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_post_start_single_background_command() {let repo = TestRepo::new();@@ -656,6 +674,8 @@ approved-commands = ["sleep 0.1 && echo 'Background task done' > background.txt"wait_for_file(output_file.as_path(), Duration::from_secs(5));}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_post_start_multiple_background_commands() {let repo = TestRepo::new();@@ -702,6 +722,8 @@ approved-commands = [);}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_both_post_create_and_post_start() {let repo = TestRepo::new();@@ -765,6 +787,8 @@ fn test_invalid_toml() {// Additional Coverage Tests// ============================================================================+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_post_start_log_file_captures_output() {let repo = TestRepo::new();@@ -858,6 +882,8 @@ approved-commands = ["echo 'unclosed quote"]);}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_post_start_multiple_commands_separate_logs() {let repo = TestRepo::new();@@ -942,6 +968,8 @@ approved-commands = [);}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_execute_flag_with_post_start_commands() {let repo = TestRepo::new();@@ -988,6 +1016,8 @@ approved-commands = ["echo 'Background task' > background.txt"]);}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_post_start_complex_shell_commands() {let repo = TestRepo::new();@@ -1020,6 +1050,8 @@ approved-commands = ["echo 'line1\nline2\nline3' | grep line2 > filtered.txt"]assert_snapshot!(contents, @"line2");}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_post_start_multiline_commands_with_newlines() {let repo = TestRepo::new();@@ -1071,6 +1103,8 @@ approved-commands = ["""");}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_post_create_multiline_with_control_structures() {let repo = TestRepo::new();@@ -1133,6 +1167,8 @@ approved-commands = ["""////// This is a regression test for a bug where post-start commands were running on ALL/// `wt switch` operations instead of only on `wt switch --create`.+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_post_start_skipped_on_existing_worktree() {let repo = TestRepo::new();diff --git a/tests/integration_tests/remove.rs b/tests/integration_tests/remove.rsindex 0e61c933c..e7228b047 100644--- a/tests/integration_tests/remove.rs+++ b/tests/integration_tests/remove.rs@@ -763,6 +763,8 @@ fn test_remove_squash_merged_then_main_advanced() {// ============================================================================/// Test pre-remove hook executes before worktree removal.+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_pre_remove_hook_executes() {// Use simple repo without remote for predictable project ID@@ -795,6 +797,8 @@ approved-commands = ["echo 'About to remove worktree'"]}/// Test pre-remove hook has access to template variables.+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_pre_remove_hook_template_variables() {// Use simple repo without remote for predictable project ID@@ -837,6 +841,8 @@ approved-commands = [}/// Test pre-remove hook runs even in background mode (before spawning background process).+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_pre_remove_hook_runs_in_background_mode() {use crate::common::wait_for_file;@@ -887,6 +893,8 @@ approved-commands = ["echo 'hook ran' > {}"]}/// Test pre-remove hook failure aborts removal (FailFast strategy).+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_pre_remove_hook_failure_aborts() {// Use simple repo without remote for predictable project ID@@ -1081,6 +1089,8 @@ approved-commands = ["touch {marker_path}"]////// This complements `test_pre_remove_hook_runs_for_detached_head` by verifying/// the hook also runs when removal happens in background (the default).+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_pre_remove_hook_runs_for_detached_head_background() {let mut repo = TestRepo::new();diff --git a/tests/integration_tests/switch.rs b/tests/integration_tests/switch.rsindex 5a9cd03d0..ab0919fbe 100644--- a/tests/integration_tests/switch.rs+++ b/tests/integration_tests/switch.rs@@ -236,6 +236,8 @@ fn test_switch_error_missing_worktree_directory() {snapshot_switch("switch_error_missing_directory", &repo, &["missing-wt"]);}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_switch_execute_success() {let repo = setup_switch_repo();@@ -247,6 +249,8 @@ fn test_switch_execute_success() {);}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_switch_execute_creates_file() {let repo = setup_switch_repo();@@ -273,6 +277,8 @@ fn test_switch_execute_failure() {);}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_switch_execute_with_existing_worktree() {let mut repo = setup_switch_repo();@@ -289,6 +295,8 @@ fn test_switch_execute_with_existing_worktree() {);}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_switch_execute_multiline() {let repo = setup_switch_repo();@@ -302,6 +310,8 @@ fn test_switch_execute_multiline() {);}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_switch_no_config_commands_execute_still_runs() {let repo = setup_switch_repo();@@ -367,6 +377,8 @@ approved-commands = ["{}"]);}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_switch_no_config_commands_with_existing_worktree() {let mut repo = setup_switch_repo();diff --git a/tests/integration_tests/user_hooks.rs b/tests/integration_tests/user_hooks.rsindex 200797197..4346592e7 100644--- a/tests/integration_tests/user_hooks.rs+++ b/tests/integration_tests/user_hooks.rs@@ -31,6 +31,8 @@ fn snapshot_switch(test_name: &str, repo: &TestRepo, args: &[&str]) {});}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_user_post_create_hook_executes() {let repo = TestRepo::new();@@ -62,6 +64,8 @@ log = "echo 'USER_POST_CREATE_RAN' > user_hook_marker.txt");}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_user_hooks_run_before_project_hooks() {let repo = TestRepo::new();@@ -98,6 +102,8 @@ approved-commands = ["echo 'PROJECT_HOOK' >> hook_order.txt"]assert_eq!(lines[1], "PROJECT_HOOK", "Project hook should run second");}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_user_hooks_no_approval_required() {let repo = TestRepo::new();@@ -169,6 +175,8 @@ approved-commands = ["echo 'PROJECT_HOOK' > project_marker.txt"]);}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_user_post_create_hook_failure() {let repo = TestRepo::new();@@ -198,6 +206,8 @@ failing = "exit 1"// User Post-Start Hook Tests (Background)// ============================================================================+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_user_post_start_hook_executes() {let repo = TestRepo::new();@@ -270,6 +280,8 @@ fn snapshot_merge(test_name: &str, repo: &TestRepo, args: &[&str], cwd: Option<&});}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_user_pre_merge_hook_executes() {let mut repo = TestRepo::new();@@ -314,6 +326,8 @@ check = "echo 'USER_PRE_MERGE_RAN' > user_premerge.txt"assert!(marker_file.exists(), "User pre-merge hook should have run");}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_user_pre_merge_hook_failure_blocks_merge() {let mut repo = TestRepo::new();@@ -464,6 +478,8 @@ long = "sh -c 'echo start >> hook.log; sleep 30; echo done >> hook.log'"// User Post-Merge Hook Tests// ============================================================================+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_user_post_merge_hook_executes() {let mut repo = TestRepo::new();@@ -558,6 +574,8 @@ cleanup = "echo 'USER_PRE_REMOVE_RAN' > /tmp/user_preremove_marker.txt"let _ = fs::remove_file(marker_file);}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_user_pre_remove_failure_blocks_removal() {let mut repo = TestRepo::new();@@ -589,6 +607,8 @@ block = "exit 1");}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_user_pre_remove_skipped_with_no_verify() {let mut repo = TestRepo::new();@@ -632,6 +652,8 @@ block = "exit 1"// User Pre-Commit Hook Tests// ============================================================================+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_user_pre_commit_hook_executes() {let mut repo = TestRepo::new();@@ -664,6 +686,8 @@ lint = "echo 'USER_PRE_COMMIT_RAN' > user_precommit.txt"assert!(marker_file.exists(), "User pre-commit hook should have run");}+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_user_pre_commit_failure_blocks_commit() {let mut repo = TestRepo::new();@@ -697,6 +721,8 @@ lint = "exit 1"// Template Variable Tests// ============================================================================+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_user_hook_template_variables() {let repo = TestRepo::new();@@ -735,6 +761,8 @@ vars = "echo 'repo={{ repo }} branch={{ branch }}' > template_vars.txt"// Combined User and Project Hooks Tests// ============================================================================+/// Skipped on Windows: snapshot output differs due to shell/path differences.+#[cfg_attr(windows, ignore)]#[test]fn test_user_and_project_post_start_both_run() {let repo = TestRepo::new();