Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
fix: approval bypass when using project: filter prefix (#331)
Maximilian Roos9e625ec22aed
diff --git a/docs/content/hook.md b/docs/content/hook.mdindex 4949bb15a..22cd4b5ff 100644--- a/docs/content/hook.md+++ b/docs/content/hook.md@@ -15,10 +15,17 @@ Hooks normally run automatically during `wt switch --create`, `wt merge`, and `wBoth user hooks (from `~/.config/worktrunk/config.toml`) and project hooks (from `.config/wt.toml`) are supported.```bash-wt hook pre-merge # Run pre-merge hooks-wt hook pre-merge --yes # Skip approval prompts (for CI)+wt hook pre-merge # Run all pre-merge hooks+wt hook pre-merge test # Run hooks named "test" from both sources+wt hook pre-merge user: # Run all user hooks+wt hook pre-merge project: # Run all project hooks+wt hook pre-merge user:test # Run only user's "test" hook+wt hook pre-merge project:test # Run only project's "test" hook+wt hook pre-merge --yes # Skip approval prompts (for CI)```+The `user:` and `project:` prefixes filter by source. Use `user:` or `project:` alone to run all hooks from that source, or `user:name` / `project:name` to run a specific hook.+## Hook types| Hook | When | Blocking | Fail-fast |@@ -239,7 +246,7 @@ User hooks support the same hook types and template variables as project hooks.| Approval | Required | Not required || Execution order | After user hooks | Before project hooks |-Skip hooks with `--no-verify`.+Skip hooks with `--no-verify`. To run a specific hook when user and project both define the same name, use `user:name` or `project:name` syntax.**Use cases:**- Personal notifications or loggingdiff --git a/src/cli.rs b/src/cli.rsindex 9cd3764d7..c3af3b4ec 100644--- a/src/cli.rs+++ b/src/cli.rs@@ -1461,10 +1461,17 @@ Hooks normally run automatically during `wt switch --create`, `wt merge`, and `wBoth user hooks (from `~/.config/worktrunk/config.toml`) and project hooks (from `.config/wt.toml`) are supported.```console-wt hook pre-merge # Run pre-merge hooks-wt hook pre-merge --yes # Skip approval prompts (for CI)+wt hook pre-merge # Run all pre-merge hooks+wt hook pre-merge test # Run hooks named "test" from both sources+wt hook pre-merge user: # Run all user hooks+wt hook pre-merge project: # Run all project hooks+wt hook pre-merge user:test # Run only user's "test" hook+wt hook pre-merge project:test # Run only project's "test" hook+wt hook pre-merge --yes # Skip approval prompts (for CI)```+The `user:` and `project:` prefixes filter by source. Use `user:` or `project:` alone to run all hooks from that source, or `user:name` / `project:name` to run a specific hook.+## Hook types| Hook | When | Blocking | Fail-fast |@@ -1685,7 +1692,7 @@ User hooks support the same hook types and template variables as project hooks.| Approval | Required | Not required || Execution order | After user hooks | Before project hooks |-Skip hooks with `--no-verify`.+Skip hooks with `--no-verify`. To run a specific hook when user and project both define the same name, use `user:name` or `project:name` syntax.**Use cases:**- Personal notifications or loggingdiff --git a/src/commands/command_approval.rs b/src/commands/command_approval.rsindex 87ae01b25..4e95f0890 100644--- a/src/commands/command_approval.rs+++ b/src/commands/command_approval.rs@@ -17,6 +17,7 @@//! This ensures approval happens exactly once at the command entry point,//! eliminating the need to thread `auto_trust` through execution layers.+use super::hooks::{HookSource, ParsedFilter};use super::project_config::{HookCommand, collect_commands_for_hooks};use super::repository_ext::RepositoryCliExt;use crate::output;@@ -185,11 +186,28 @@ pub fn approve_hooks(/// When `name_filter` is provided, only commands matching that name are shown/// in the approval prompt. This is used by `wt hook <type> --name <name>` to/// approve only the targeted hook rather than all hooks of that type.+///+/// Supports filter syntax:+/// - `"foo"` — approves commands named "foo" from project config+/// - `"project:foo"` — approves commands named "foo" from project config+/// - `"project:"` — approves all commands from project config+/// - `"user:"` or `"user:foo"` — skips approval (user hooks don't need approval)pub fn approve_hooks_filtered(ctx: &super::command_executor::CommandContext<'_>,hook_types: &[HookType],name_filter: Option<&str>,) -> anyhow::Result<bool> {+ // Parse filter to understand source and name separately+ // Uses the same ParsedFilter as hooks.rs for consistent behavior+ let parsed = name_filter.map(ParsedFilter::parse);++ // If filter explicitly targets user hooks only, skip project approval entirely+ if let Some(ref f) = parsed+ && f.source == Some(HookSource::User)+ {+ return Ok(true);+ }+let project_config = match ctx.repo.load_project_config()? {Some(cfg) => cfg,None => return Ok(true), // No project config = no commands to approve@@ -198,8 +216,12 @@ pub fn approve_hooks_filtered(let mut commands = collect_commands_for_hooks(&project_config, hook_types);// Apply name filter before approval to only prompt for targeted commands- if let Some(name) = name_filter {- commands.retain(|cmd| cmd.command.name.as_deref() == Some(name));+ // Use the parsed name (not raw filter) for matching+ // Empty name (e.g., "project:") means match all project commands - no filtering+ if let Some(ref f) = parsed+ && !f.name.is_empty()+ {+ commands.retain(|cmd| cmd.command.name.as_deref() == Some(f.name));}if commands.is_empty() {diff --git a/src/commands/hooks.rs b/src/commands/hooks.rsindex c936865d6..a77d65918 100644--- a/src/commands/hooks.rs+++ b/src/commands/hooks.rs@@ -1,17 +1,3 @@-// TODO(hook-naming): Refine hook display and filtering when user and project have same name-//-// Current behavior with `wt hook pre-merge foo`:-// - Both user's "foo" and project's "foo" run (name filter applied to each source separately)-// - Output: "Running user pre-merge foo:" then "Running project pre-merge foo:"-//-// Alternative approaches to consider:-// 1. Show source in name: "Running pre-merge user:foo" / "Running pre-merge project:foo"-// 2. Allow filtering by source: `wt hook pre-merge user:foo` runs only user's foo-// 3. Current approach: always show "user"/"project" prefix, filter runs both-//-// The source prefix in filtering (option 2) would need to be used elsewhere too to justify-// the syntax. Current behavior is reasonable but worth revisiting if users find it confusing.-use color_print::cformat;use worktrunk::HookType;use worktrunk::config::CommandConfig;@@ -26,15 +12,22 @@ use crate::output::execute_command_in_worktree;pub struct SourcedCommand {pub prepared: PreparedCommand,pub source: HookSource,- /// Display label like "user post-start" or "project pre-merge"- pub label: String,+ pub hook_type: HookType,}impl SourcedCommand {/// Announce this command before execution.+ ///+ /// Format: "Running pre-merge user:foo:" for named, "Running post-create user hook:" for unnamedfn announce(&self) -> anyhow::Result<()> {+ // Named: "user:foo" matches filter syntax+ // Unnamed: "user hook" is clearer than just "user:"+ let display_name = match &self.prepared.name {+ Some(n) => format!("{}:{}", self.source, n),+ None => format!("{} hook", self.source),+ };let full_label =- crate::commands::format_command_label(&self.label, self.prepared.name.as_deref());+ crate::commands::format_command_label(&self.hook_type.to_string(), Some(&display_name));crate::output::print(progress_message(format!("{full_label}:")))?;crate::output::gutter(format_bash_with_gutter(&self.prepared.expanded))?;Ok(())@@ -55,7 +48,7 @@ pub enum HookFailureStrategy {////// Approval for project hooks is handled at the gate (command entry point),/// not during hook execution.-#[derive(Clone, Copy, strum::Display)]+#[derive(Clone, Copy, Debug, PartialEq, Eq, strum::Display)]#[strum(serialize_all = "kebab-case")]pub enum HookSource {/// User hooks from ~/.config/worktrunk/config.toml (no approval required)@@ -64,16 +57,48 @@ pub enum HookSource {Project,}-impl HookSource {- /// Format a label for display: "user pre-merge" or "project pre-merge"- pub fn format_label(&self, hook_type: HookType) -> String {- format!("{} {}", self, hook_type)+/// A parsed name filter, optionally scoped to a specific source.+///+/// Supports formats:+/// - `"foo"` - matches commands named "foo" from any source+/// - `"user:foo"` - matches only user's command named "foo"+/// - `"project:foo"` - matches only project's command named "foo"+/// - `"user:"` or `"project:"` - matches all commands from that source+pub struct ParsedFilter<'a> {+ pub source: Option<HookSource>,+ pub name: &'a str,+}++impl<'a> ParsedFilter<'a> {+ pub fn parse(filter: &'a str) -> Self {+ if let Some(name) = filter.strip_prefix("user:") {+ Self {+ source: Some(HookSource::User),+ name,+ }+ } else if let Some(name) = filter.strip_prefix("project:") {+ Self {+ source: Some(HookSource::Project),+ name,+ }+ } else {+ Self {+ source: None,+ name: filter,+ }+ }+ }++ /// Check if this filter matches the given source.+ fn matches_source(&self, source: HookSource) -> bool {+ self.source.is_none() || self.source == Some(source)}}/// Prepare hook commands from both user and project configs.////// Collects commands from user config first, then project config, applying the name filter.+/// The filter supports source prefixes: `user:foo` or `project:foo` to run only from one source./// Returns a flat list of commands with source information for execution.pub fn prepare_hook_commands(ctx: &CommandContext,@@ -83,44 +108,56 @@ pub fn prepare_hook_commands(extra_vars: &[(&str, &str)],name_filter: Option<&str>,) -> anyhow::Result<Vec<SourcedCommand>> {+ let parsed_filter = name_filter.map(ParsedFilter::parse);let mut commands = Vec::new();if let Some(config) = user_config {- let prepared = prepare_commands(config, ctx, extra_vars, hook_type)?;- let filtered = filter_by_name(prepared, name_filter);- let label = HookSource::User.format_label(hook_type);- commands.extend(filtered.into_iter().map(|p| SourcedCommand {- prepared: p,- source: HookSource::User,- label: label.clone(),- }));+ // Skip user commands if filter specifies project source+ if parsed_filter+ .as_ref()+ .is_none_or(|f| f.matches_source(HookSource::User))+ {+ let prepared = prepare_commands(config, ctx, extra_vars, hook_type)?;+ let filtered = filter_by_name(prepared, parsed_filter.as_ref().map(|f| f.name));+ commands.extend(filtered.into_iter().map(|p| SourcedCommand {+ prepared: p,+ source: HookSource::User,+ hook_type,+ }));+ }}if let Some(config) = project_config {- let prepared = prepare_commands(config, ctx, extra_vars, hook_type)?;- let filtered = filter_by_name(prepared, name_filter);- let label = HookSource::Project.format_label(hook_type);- commands.extend(filtered.into_iter().map(|p| SourcedCommand {- prepared: p,- source: HookSource::Project,- label: label.clone(),- }));+ // Skip project commands if filter specifies user source+ if parsed_filter+ .as_ref()+ .is_none_or(|f| f.matches_source(HookSource::Project))+ {+ let prepared = prepare_commands(config, ctx, extra_vars, hook_type)?;+ let filtered = filter_by_name(prepared, parsed_filter.as_ref().map(|f| f.name));+ commands.extend(filtered.into_iter().map(|p| SourcedCommand {+ prepared: p,+ source: HookSource::Project,+ hook_type,+ }));+ }}Ok(commands)}/// Filter commands by name (returns empty vec if name not found).+/// Empty name matches all commands (supports `user:` to mean "all user hooks").fn filter_by_name(commands: Vec<PreparedCommand>,name_filter: Option<&str>,) -> Vec<PreparedCommand> {match name_filter {- Some(name) => commands+ Some(name) if !name.is_empty() => commands.into_iter().filter(|cmd| cmd.name.as_deref() == Some(name)).collect(),- None => commands,+ _ => commands, // None or empty = match all}}@@ -139,10 +176,20 @@ pub fn spawn_hook_commands_background(let operation_prefix = hook_type.to_string();+ // Track index for unnamed commands to prevent log collisions+ let mut unnamed_index = 0usize;+for cmd in commands {cmd.announce()?;- let name = cmd.prepared.name.as_deref().unwrap_or("cmd");+ let name = match &cmd.prepared.name {+ Some(n) => n.clone(),+ None => {+ let idx = unnamed_index;+ unnamed_index += 1;+ format!("cmd-{idx}")+ }+ };// Include source in operation name to prevent log file collisions between// user and project hooks with the same namelet operation = format!("{}-{}-{}", cmd.source, operation_prefix, name);@@ -184,11 +231,16 @@ fn check_name_filter_matched(user_config: Option<&CommandConfig>,project_config: Option<&CommandConfig>,) -> anyhow::Result<()> {- if let Some(name) = name_filter+ if let Some(filter_str) = name_filter&& total_commands_run == 0{+ let parsed = ParsedFilter::parse(filter_str);let mut available = Vec::new();- if let Some(config) = user_config {++ // Only show commands from sources that match the filter+ if parsed.matches_source(HookSource::User)+ && let Some(config) = user_config+ {available.extend(config.commands()@@ -196,7 +248,9 @@ fn check_name_filter_matched(.filter_map(|c| c.name.as_ref().map(|n| format!("user:{n}"))),);}- if let Some(config) = project_config {+ if parsed.matches_source(HookSource::Project)+ && let Some(config) = project_config+ {available.extend(config.commands()@@ -205,7 +259,7 @@ fn check_name_filter_matched();}return Err(worktrunk::git::GitError::HookCommandNotFound {- name: name.to_string(),+ name: filter_str.to_string(),available,}.into());@@ -323,8 +377,8 @@ pub fn run_hook_concurrent_with_filter(extra_vars: &[(&str, &str)],name_filter: Option<&str>,) -> anyhow::Result<()> {+ use rayon::prelude::*;use std::process::Stdio;- use std::thread;use worktrunk::shell_exec::ShellConfig;let commands = prepare_hook_commands(@@ -354,83 +408,58 @@ pub fn run_hook_concurrent_with_filter(eprint!("{}", anstyle::Reset);stderr().flush().ok();- // Spawn all commands in parallel together.+ // Run commands concurrently using Rayon's thread pool.//// Note: Unlike sequential execution (execute_streaming), we don't use process_group(0)// or sophisticated signal forwarding here. Children inherit the foreground process group,// so Ctrl+C sends SIGINT to all of them together. This simpler behavior is acceptable for// "best effort" concurrent hooks - if the user interrupts, everything stops.- //- // Adding proper signal forwarding would require either spawning all children from the main- // thread (not worker threads) or sharing child PIDs across threads with a coordinating- // signal handler. The complexity isn't warranted for this use case.let shell = ShellConfig::get();- let worktree_path = ctx.worktree_path.to_path_buf();-- let handles: Vec<_> = commands- .into_iter()- .map(|cmd| {- let shell = shell.clone();- let worktree_path = worktree_path.clone();- let prepared = cmd.prepared;-- thread::spawn(move || {- use std::io::Write;-- let mut child_cmd = shell.command(&prepared.expanded);- child_cmd- .current_dir(&worktree_path)- .stdin(Stdio::piped())- .stdout(Stdio::from(std::io::stderr()))- .stderr(Stdio::inherit())- .env_remove(worktrunk::shell_exec::DIRECTIVE_FILE_ENV_VAR);-- let mut child = match child_cmd.spawn() {- Ok(child) => child,- Err(e) => {- return Some(HookFailure {- name: prepared.name.clone(),- error: e.to_string(),- exit_code: None,- });- }- };-- // Pipe context JSON to stdin (same as sequential execution)- if let Some(mut stdin) = child.stdin.take() {- // Ignore write errors - command may not read stdin- let _ = stdin.write_all(prepared.context_json.as_bytes());- }-- match child.wait() {- Ok(status) if status.success() => None,- Ok(status) => Some(HookFailure {- name: prepared.name.clone(),- error: format!("exit status: {}", status.code().unwrap_or(-1)),- exit_code: status.code(),- }),- Err(e) => Some(HookFailure {+ let worktree_path = ctx.worktree_path;++ let all_failures: Vec<HookFailure> = commands+ .par_iter()+ .filter_map(|cmd| {+ use std::io::Write;++ let prepared = &cmd.prepared;+ let mut child_cmd = shell.command(&prepared.expanded);+ child_cmd+ .current_dir(worktree_path)+ .stdin(Stdio::piped())+ .stdout(Stdio::from(std::io::stderr()))+ .stderr(Stdio::inherit())+ .env_remove(worktrunk::shell_exec::DIRECTIVE_FILE_ENV_VAR);++ let mut child = match child_cmd.spawn() {+ Ok(child) => child,+ Err(e) => {+ return Some(HookFailure {name: prepared.name.clone(),error: e.to_string(),exit_code: None,- }),+ });}- })- })- .collect();+ };++ // Pipe context JSON to stdin (same as sequential execution)+ if let Some(mut stdin) = child.stdin.take() {+ // Ignore write errors - command may not read stdin+ let _ = stdin.write_all(prepared.context_json.as_bytes());+ }- // Wait for all and collect failures- let all_failures: Vec<HookFailure> = handles- .into_iter()- .filter_map(|h| match h.join() {- Ok(result) => result,- Err(_) => {- // Thread panicked - treat as failure (command name context is lost)- Some(HookFailure {- name: None,- error: "thread panicked".to_string(),+ match child.wait() {+ Ok(status) if status.success() => None,+ Ok(status) => Some(HookFailure {+ name: prepared.name.clone(),+ error: format!("exit status: {}", status.code().unwrap_or(-1)),+ exit_code: status.code(),+ }),+ Err(e) => Some(HookFailure {+ name: prepared.name.clone(),+ error: e.to_string(),exit_code: None,- })+ }),}}).collect();@@ -438,26 +467,28 @@ pub fn run_hook_concurrent_with_filter(// Report all failures at the endif !all_failures.is_empty() {let first = &all_failures[0];- let error_msg = if all_failures.len() == 1 {- match &first.name {- Some(name) => format!("{}: {}", name, first.error),- None => first.error.clone(),- }+ // For single failure, use command_name field (no duplication in error).+ // For multiple failures, list all names in the error message.+ let (command_name, error_msg) = if all_failures.len() == 1 {+ (first.name.clone(), first.error.clone())} else {let names: Vec<_> = all_failures.iter().map(|f| f.name.as_deref().unwrap_or("(unnamed)")).collect();- format!(- "{} commands failed: {}",- all_failures.len(),- names.join(", ")+ (+ None, // Multiple failures - no single command to blame+ format!(+ "{} commands failed: {}",+ all_failures.len(),+ names.join(", ")+ ),)};return Err(WorktrunkError::HookCommandFailed {hook_type,- command_name: first.name.clone(),+ command_name,error: error_msg,exit_code: first.exit_code,}@@ -477,22 +508,6 @@ mod tests {assert_eq!(HookSource::Project.to_string(), "project");}- #[test]- fn test_hook_source_format_label() {- assert_eq!(- HookSource::User.format_label(HookType::PreMerge),- "user pre-merge"- );- assert_eq!(- HookSource::Project.format_label(HookType::PostCreate),- "project post-create"- );- assert_eq!(- HookSource::User.format_label(HookType::PreCommit),- "user pre-commit"- );- }-#[test]fn test_hook_failure_strategy_copy() {let strategy = HookFailureStrategy::FailFast;@@ -503,4 +518,54 @@ mod tests {let copied_warn = warn;assert!(matches!(copied_warn, HookFailureStrategy::Warn));}++ #[test]+ fn test_parsed_filter_no_prefix() {+ let filter = ParsedFilter::parse("foo");+ assert!(filter.source.is_none());+ assert_eq!(filter.name, "foo");+ assert!(filter.matches_source(HookSource::User));+ assert!(filter.matches_source(HookSource::Project));+ }++ #[test]+ fn test_parsed_filter_user_prefix() {+ let filter = ParsedFilter::parse("user:foo");+ assert_eq!(filter.source, Some(HookSource::User));+ assert_eq!(filter.name, "foo");+ assert!(filter.matches_source(HookSource::User));+ assert!(!filter.matches_source(HookSource::Project));+ }++ #[test]+ fn test_parsed_filter_project_prefix() {+ let filter = ParsedFilter::parse("project:bar");+ assert_eq!(filter.source, Some(HookSource::Project));+ assert_eq!(filter.name, "bar");+ assert!(!filter.matches_source(HookSource::User));+ assert!(filter.matches_source(HookSource::Project));+ }++ #[test]+ fn test_parsed_filter_colon_in_name() {+ // A name like "my:hook" without valid prefix should be parsed as-is+ let filter = ParsedFilter::parse("my:hook");+ assert!(filter.source.is_none());+ assert_eq!(filter.name, "my:hook");+ }++ #[test]+ fn test_parsed_filter_source_only() {+ // "user:" means all user hooks (empty name)+ let filter = ParsedFilter::parse("user:");+ assert_eq!(filter.source, Some(HookSource::User));+ assert_eq!(filter.name, "");+ assert!(filter.matches_source(HookSource::User));+ assert!(!filter.matches_source(HookSource::Project));++ // "project:" means all project hooks+ let filter = ParsedFilter::parse("project:");+ assert_eq!(filter.source, Some(HookSource::Project));+ assert_eq!(filter.name, "");+ }}diff --git a/tests/integration_tests/approval_ui.rs b/tests/integration_tests/approval_ui.rsindex a2cfdda26..a8a3b208a 100644--- a/tests/integration_tests/approval_ui.rs+++ b/tests/integration_tests/approval_ui.rs@@ -472,6 +472,102 @@ fn test_step_hook_name_filter_on_unnamed_command(repo: TestRepo) {});}+/// Helper for step hook snapshot tests with extra args and approval prompt+fn snapshot_run_hook_with_args(test_name: &str, repo: &TestRepo, args: &[&str], approve: bool) {+ let settings = setup_snapshot_settings(repo);+ settings.bind(|| {+ let mut cmd = make_snapshot_cmd(repo, "hook", args, None);+ cmd.stdin(Stdio::piped())+ .stdout(Stdio::piped())+ .stderr(Stdio::piped());++ let mut child = cmd.spawn().unwrap();++ // Write approval response+ {+ let stdin = child.stdin.as_mut().unwrap();+ let response = if approve { b"y\n" } else { b"n\n" };+ stdin.write_all(response).unwrap();+ }++ let output = child.wait_with_output().unwrap();++ // Use insta snapshot for combined output+ let stdout = String::from_utf8_lossy(&output.stdout);+ let stderr = String::from_utf8_lossy(&output.stderr);+ let combined = format!(+ "exit_code: {}\n----- stdout -----\n{}\n----- stderr -----\n{}",+ output.status.code().unwrap_or(-1),+ stdout,+ stderr+ );++ insta::assert_snapshot!(test_name, combined);+ });+}++/// Test that `project:` prefix filter still requires approval (security fix test)+///+/// This verifies the fix for the approval bypass vulnerability where `project:name`+/// filter syntax was not correctly parsed by the approval gate, allowing project+/// hooks to run without approval.+#[rstest]+fn test_project_prefix_requires_approval(repo: TestRepo) {+ repo.write_project_config(+ r#"[pre-merge]+test = "echo 'Running project test'"+"#,+ );+ repo.commit("Add pre-merge hook");++ // Running with project: prefix should still require approval+ // Decline to verify the prompt appears+ snapshot_run_hook_with_args(+ "project_prefix_requires_approval",+ &repo,+ &["pre-merge", "project:test"],+ false,+ );+}++/// Test that `project:` (all project hooks) requires approval+#[rstest]+fn test_project_prefix_all_requires_approval(repo: TestRepo) {+ repo.write_project_config(+ r#"[pre-merge]+test = "echo 'Running project test'"+lint = "echo 'Running project lint'"+"#,+ );+ repo.commit("Add pre-merge hooks");++ // Running with project: (no name) should require approval for all project hooks+ snapshot_run_hook_with_args(+ "project_prefix_all_requires_approval",+ &repo,+ &["pre-merge", "project:"],+ false,+ );+}++/// Test that `user:` prefix skips approval (user hooks don't need it)+#[rstest]+fn test_user_prefix_skips_approval(repo: TestRepo) {+ // Set up user config with a hook+ repo.write_test_config(+ r#"[pre-merge]+test = "echo 'user test'"+"#,+ );++ // Running with user: prefix should not prompt for approval+ let settings = setup_snapshot_settings(&repo);+ settings.bind(|| {+ let mut cmd = make_snapshot_cmd(&repo, "hook", &["pre-merge", "user:test"], None);+ assert_cmd_snapshot!("user_prefix_skips_approval", cmd);+ });+}+/// Test running all hooks (no name filter) still works#[rstest]fn test_step_hook_run_all_commands(repo: TestRepo) {diff --git a/tests/integration_tests/shell_wrapper.rs b/tests/integration_tests/shell_wrapper.rsindex d813ea15d..f2165857a 100644--- a/tests/integration_tests/shell_wrapper.rs+++ b/tests/integration_tests/shell_wrapper.rs@@ -1354,23 +1354,8 @@ approved-commands = ["echo 'background task'"]assert_eq!(output.exit_code, 0, "Command should succeed");- // Critical assertion: progress messages should appear to users- // This is the test that catches the bug where progress() was incorrectly suppressed- assert!(- output.combined.contains("Running project post-start"),- "Progress message 'Running project post-start' missing from output. \- Output:\n{}",- output.combined- );-- // The background command itself should be shown via gutter formatting- assert!(- output.combined.contains("background task"),- "Background command content missing from output"- );-- // Normalize paths in output for snapshot testing- // Snapshot the full output+ // Snapshot verifies progress messages appear to users+ // (catches the bug where progress() was incorrectly suppressed)assert_snapshot!(output.normalized());}@@ -1419,20 +1404,7 @@ approved-commands = ["echo 'fish background task'"]assert_eq!(output.exit_code, 0, "Command should succeed");- // Critical: progress messages should appear to users through Fish wrapper- assert!(- output.combined.contains("Running project post-start"),- "Progress message 'Running project post-start' missing from Fish wrapper output. \- Output:\n{}",- output.combined- );-- // The background command itself should be shown via gutter formatting- assert!(- output.combined.contains("fish background task"),- "Background command content missing from output"- );-+ // Snapshot verifies progress messages appear to users through Fish wrapperassert_snapshot!(output.normalized());}diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snapindex 07d30723b..e68bab69c 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap@@ -9,7 +9,7 @@ y[2m○[22m post-create:[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m[0m[36m❯[39m Allow and remember? [1m[y/N][22m-[36m◎[39m [36mRunning project post-create:[39m+[36m◎[39m [36mRunning post-create [1mproject hook[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m[0m[0mtest command[32m✓[39m [32mCreated new worktree for [1mtest-approve[22m from [1mmain[22m @ [1m_REPO_/repo.test-approve[22m[39mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snapindex 7fc8a8d76..02c52c490 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap@@ -11,13 +11,13 @@ y[2m○[22m post-create [1mthird[22m:[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Third command'[0m[2m[0m[36m❯[39m Allow and remember? [1m[y/N][22m-[36m◎[39m [36mRunning project post-create [1mfirst[22m:[39m+[36m◎[39m [36mRunning post-create [1mproject:first[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'First command'[0m[2m[0m[0mFirst command-[36m◎[39m [36mRunning project post-create [1msecond[22m:[39m+[36m◎[39m [36mRunning post-create [1mproject:second[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Second command'[0m[2m[0m[0mSecond command-[36m◎[39m [36mRunning project post-create [1mthird[22m:[39m+[36m◎[39m [36mRunning post-create [1mproject:third[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Third command'[0m[2m[0m[0mThird command[32m✓[39m [32mCreated new worktree for [1mtest-mixed-accept[22m from [1mmain[22m @ [1m_REPO_/repo.test-mixed-accept[22m[39mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snapindex 22cd4189d..1d0a90027 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap@@ -13,13 +13,13 @@ y[2m○[22m post-create [1mthird[22m:[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Third command'[0m[2m[0m[36m❯[39m Allow and remember? [1m[y/N][22m-[36m◎[39m [36mRunning project post-create [1mfirst[22m:[39m+[36m◎[39m [36mRunning post-create [1mproject:first[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'First command'[0m[2m[0m[0mFirst command-[36m◎[39m [36mRunning project post-create [1msecond[22m:[39m+[36m◎[39m [36mRunning post-create [1mproject:second[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Second command'[0m[2m[0m[0mSecond command-[36m◎[39m [36mRunning project post-create [1mthird[22m:[39m+[36m◎[39m [36mRunning post-create [1mproject:third[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Third command'[0m[2m[0m[0mThird command[32m✓[39m [32mCreated new worktree for [1mtest-multi[22m from [1mmain[22m @ [1m_REPO_/repo.test-multi[22m[39mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snapindex 14502a846..ea79c7790 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap@@ -13,13 +13,13 @@ y[2m○[22m post-create [1mtest[22m:[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Running tests...'[0m[2m[0m[36m❯[39m Allow and remember? [1m[y/N][22m-[36m◎[39m [36mRunning project post-create [1minstall[22m:[39m+[36m◎[39m [36mRunning post-create [1mproject:install[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Installing dependencies...'[0m[2m[0m[0mInstalling dependencies...-[36m◎[39m [36mRunning project post-create [1mbuild[22m:[39m+[36m◎[39m [36mRunning post-create [1mproject:build[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Building project...'[0m[2m[0m[0mBuilding project...-[36m◎[39m [36mRunning project post-create [1mtest[22m:[39m+[36m◎[39m [36mRunning post-create [1mproject:test[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Running tests...'[0m[2m[0m[0mRunning tests...[32m✓[39m [32mCreated new worktree for [1mtest-named[22m from [1mmain[22m @ [1m_REPO_/repo.test-named[22m[39mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snapindex 7e18176f7..3299ee587 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap@@ -11,7 +11,7 @@ y[36m❯[39m Allow and remember? [1m[y/N][22m[33m▲[39m [33mFailed to save command approval: Failed to write config file: Permission denied (os error 13)[39m[2m↳[22m [2mApproval will be requested again next time.[22m-[36m◎[39m [36mRunning project post-create:[39m+[36m◎[39m [36mRunning post-create [1mproject hook[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m[0m[0mtest command[32m✓[39m [32mCreated new worktree for [1mtest-permission[22m from [1mmain[22m @ [1m_REPO_/repo.test-permission[22m[39mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snapindex d276754db..5547244ca 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap@@ -3,5 +3,5 @@ source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()---[32m✓[39m [32mCreated new worktree for [1mfish-bg[22m from [1mmain[22m @ [1m[TMPDIR]/repo.fish-bg[22m[39m-[36m◎[39m [36mRunning project post-start:[39m+[36m◎[39m [36mRunning post-start [1mproject hook[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'fish background task'[0m[2m[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snapindex 9d36af1ed..e6cbe1dd5 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap@@ -2,7 +2,7 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()----[36m◎[39m [36mRunning project pre-merge [1mcheck1[22m:[39m+[36m◎[39m [36mRunning pre-merge [1mproject:check1[22m:[39m[107m [0m [2m[0m[2m[34m[TMPDIR]/repo/mixed-output.sh[0m[2m check1 3[0m[check1] stdout line 1[check1] stderr line 1@@ -12,7 +12,7 @@ expression: output.normalized()[check1] stderr line 3[check1] stdout complete[check1] stderr complete-[36m◎[39m [36mRunning project pre-merge [1mcheck2[22m:[39m+[36m◎[39m [36mRunning pre-merge [1mproject:check2[22m:[39m[107m [0m [2m[0m[2m[34m[TMPDIR]/repo/mixed-output.sh[0m[2m check2 3[0m[check2] stdout line 1[check2] stderr line 1diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snapindex 9d36af1ed..e6cbe1dd5 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap@@ -2,7 +2,7 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()----[36m◎[39m [36mRunning project pre-merge [1mcheck1[22m:[39m+[36m◎[39m [36mRunning pre-merge [1mproject:check1[22m:[39m[107m [0m [2m[0m[2m[34m[TMPDIR]/repo/mixed-output.sh[0m[2m check1 3[0m[check1] stdout line 1[check1] stderr line 1@@ -12,7 +12,7 @@ expression: output.normalized()[check1] stderr line 3[check1] stdout complete[check1] stderr complete-[36m◎[39m [36mRunning project pre-merge [1mcheck2[22m:[39m+[36m◎[39m [36mRunning pre-merge [1mproject:check2[22m:[39m[107m [0m [2m[0m[2m[34m[TMPDIR]/repo/mixed-output.sh[0m[2m check2 3[0m[check2] stdout line 1[check2] stderr line 1diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snapindex 33cbb61f3..1407a084a 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap@@ -2,10 +2,10 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()----[36m◎[39m [36mRunning project pre-merge [1mformat[22m:[39m+[36m◎[39m [36mRunning pre-merge [1mproject:format[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'✓ Code formatting check passed'[0m[2m[0m✓ Code formatting check passed-[36m◎[39m [36mRunning project pre-merge [1mtest[22m:[39m+[36m◎[39m [36mRunning pre-merge [1mproject:test[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'✗ Test suite failed: 3 tests failing'[0m[2m [0m[2m[36m&&[0m[2m [0m[2m[34mexit[0m[2m 1[0m✗ Test suite failed: 3 tests failing[31m✗[39m [31mpre-merge command failed: [1mtest[22m: exit status: 1[39mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snapindex 33cbb61f3..1407a084a 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap@@ -2,10 +2,10 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()----[36m◎[39m [36mRunning project pre-merge [1mformat[22m:[39m+[36m◎[39m [36mRunning pre-merge [1mproject:format[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'✓ Code formatting check passed'[0m[2m[0m✓ Code formatting check passed-[36m◎[39m [36mRunning project pre-merge [1mtest[22m:[39m+[36m◎[39m [36mRunning pre-merge [1mproject:test[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'✗ Test suite failed: 3 tests failing'[0m[2m [0m[2m[36m&&[0m[2m [0m[2m[34mexit[0m[2m 1[0m✗ Test suite failed: 3 tests failing[31m✗[39m [31mpre-merge command failed: [1mtest[22m: exit status: 1[39mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snapindex 970021aa3..f511c8f3a 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap@@ -2,13 +2,13 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()----[36m◎[39m [36mRunning project pre-merge [1mformat[22m:[39m+[36m◎[39m [36mRunning pre-merge [1mproject:format[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'✓ Code formatting check passed'[0m[2m[0m✓ Code formatting check passed-[36m◎[39m [36mRunning project pre-merge [1mlint[22m:[39m+[36m◎[39m [36mRunning pre-merge [1mproject:lint[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'✓ Linting passed - no warnings'[0m[2m[0m✓ Linting passed - no warnings-[36m◎[39m [36mRunning project pre-merge [1mtest[22m:[39m+[36m◎[39m [36mRunning pre-merge [1mproject:test[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'✓ All 47 tests passed in 2.3s'[0m[2m[0m✓ All 47 tests passed in 2.3s[36m◎[39m [36mMerging 1 commit to [1mmain[22m @ [2m[HASH][22m (no commit/squash/rebase needed)[39mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snapindex 970021aa3..f511c8f3a 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap@@ -2,13 +2,13 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()----[36m◎[39m [36mRunning project pre-merge [1mformat[22m:[39m+[36m◎[39m [36mRunning pre-merge [1mproject:format[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'✓ Code formatting check passed'[0m[2m[0m✓ Code formatting check passed-[36m◎[39m [36mRunning project pre-merge [1mlint[22m:[39m+[36m◎[39m [36mRunning pre-merge [1mproject:lint[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'✓ Linting passed - no warnings'[0m[2m[0m✓ Linting passed - no warnings-[36m◎[39m [36mRunning project pre-merge [1mtest[22m:[39m+[36m◎[39m [36mRunning pre-merge [1mproject:test[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'✓ All 47 tests passed in 2.3s'[0m[2m[0m✓ All 47 tests passed in 2.3s[36m◎[39m [36mMerging 1 commit to [1mmain[22m @ [2m[HASH][22m (no commit/squash/rebase needed)[39mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_post_create.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_post_create.snapindex efb562861..b3f09c7db 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_post_create.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_post_create.snap@@ -2,11 +2,11 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()----[36m◎[39m [36mRunning project post-create [1minstall[22m:[39m+[36m◎[39m [36mRunning post-create [1mproject:install[22m:[39m[107m [0m [2m[0m[2m[34muv[0m[2m sync[0mResolved 24 packages in 145msInstalled 24 packages in 1.2s[32m✓[39m [32mCreated new worktree for [1mfeature-x[22m from [1mmain[22m @ [1m[TMPDIR]/repo.feature-x[22m[39m-[36m◎[39m [36mRunning project post-start [1mdev[22m:[39m+[36m◎[39m [36mRunning post-start [1mproject:dev[22m:[39m[107m [0m [2m[0m[2m[34muv[0m[2m run dev[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_pre_merge.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_pre_merge.snapindex dcc20baa2..89cd9fd10 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_pre_merge.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_pre_merge.snap@@ -9,7 +9,7 @@ expression: output.normalized()[107m [0m Implement login and token refresh endpoints with JWT validation.[107m [0m Includes comprehensive test coverage and input validation.[32m✓[39m [32mSquashed @ [2m[HASH][22m[39m-[36m◎[39m [36mRunning project pre-merge [1mtest[22m:[39m+[36m◎[39m [36mRunning pre-merge [1mproject:test[22m:[39m[107m [0m [2m[0m[2m[34muv[0m[2m run pytest[0m============================= test session starts ==============================@@ -21,7 +21,7 @@ tests/test_auth.py::test_token_validation PASSED [100%]============================== 3 passed in 0.8s ===============================-[36m◎[39m [36mRunning project pre-merge [1mlint[22m:[39m+[36m◎[39m [36mRunning pre-merge [1mproject:lint[22m:[39m[107m [0m [2m[0m[2m[34muv[0m[2m run ruff check[0mAll checks passed!diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snapindex 363804262..a97c70959 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap@@ -2,14 +2,14 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()----[36m◎[39m [36mRunning project post-create [1minstall[22m:[39m+[36m◎[39m [36mRunning post-create [1mproject:install[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Installing dependencies...'[0m[2m[0mInstalling dependencies...-[36m◎[39m [36mRunning project post-create [1mbuild[22m:[39m+[36m◎[39m [36mRunning post-create [1mproject:build[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Building project...'[0m[2m[0mBuilding project...[32m✓[39m [32mCreated new worktree for [1mfeature-hooks[22m from [1mmain[22m @ [1m[TMPDIR]/repo.feature-hooks[22m[39m-[36m◎[39m [36mRunning project post-start [1mserver[22m:[39m+[36m◎[39m [36mRunning post-start [1mproject:server[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Starting dev server on port 3000'[0m[2m[0m-[36m◎[39m [36mRunning project post-start [1mwatch[22m:[39m+[36m◎[39m [36mRunning post-start [1mproject:watch[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Watching for file changes'[0m[2m[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snapindex a0534abc9..cd8cfd019 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap@@ -3,5 +3,5 @@ source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()---[32m✓[39m [32mCreated new worktree for [1mfeature-with-hooks[22m from [1mmain[22m @ [1m[TMPDIR]/repo.feature-with-hooks[22m[39m-[36m◎[39m [36mRunning project post-start:[39m+[36m◎[39m [36mRunning post-start [1mproject hook[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command executed'[0m[2m[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snapindex 0f2f9f997..07e3a8b2d 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap@@ -3,5 +3,5 @@ source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()---[32m✓[39m [32mCreated new worktree for [1mfeature-bg[22m from [1mmain[22m @ [1m[TMPDIR]/repo.feature-bg[22m[39m-[36m◎[39m [36mRunning project post-start:[39m+[36m◎[39m [36mRunning post-start [1mproject hook[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'background task'[0m[2m[0mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snap b/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snapindex d3f834795..962520e4a 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snap@@ -31,7 +31,7 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎[39m [36mRunning project post-create:[39m+[36m◎[39m [36mRunning post-create [1mproject hook[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'approved'[0m[2m [0m[2m[36m>[0m[2m output.txt[0m[32m✓[39m [32mCreated new worktree for [1mtest-approved[22m from [1mmain[22m @ [1m_REPO_.test-approved[22m[39m[2m↳[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__project_prefix_all_requires_approval.snap b/tests/snapshots/integration__integration_tests__approval_ui__project_prefix_all_requires_approval.snapnew file mode 100644index 000000000..40254833b--- /dev/null+++ b/tests/snapshots/integration__integration_tests__approval_ui__project_prefix_all_requires_approval.snap@@ -0,0 +1,16 @@+---+source: tests/integration_tests/approval_ui.rs+expression: combined+---+exit_code: 1+----- stdout -----++----- stderr -----+[33m▲[39m [33m[1mrepo[22m needs approval to execute [1m2[22m commands:[39m++[2m○[22m pre-merge [1mtest[22m:+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Running project test'[0m[2m+[2m○[22m pre-merge [1mlint[22m:+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Running project lint'[0m[2m+[31m✗[39m [31mCannot prompt for approval in non-interactive environment[39m+[2m↳[22m [2mTo skip prompts in CI/CD, add [90m--yes[39m; to pre-approve commands, run [90mwt hook approvals add[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__project_prefix_requires_approval.snap b/tests/snapshots/integration__integration_tests__approval_ui__project_prefix_requires_approval.snapnew file mode 100644index 000000000..f76713b12--- /dev/null+++ b/tests/snapshots/integration__integration_tests__approval_ui__project_prefix_requires_approval.snap@@ -0,0 +1,14 @@+---+source: tests/integration_tests/approval_ui.rs+expression: combined+---+exit_code: 1+----- stdout -----++----- stderr -----+[33m▲[39m [33m[1mrepo[22m needs approval to execute [1m1[22m command:[39m++[2m○[22m pre-merge [1mtest[22m:+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Running project test'[0m[2m+[31m✗[39m [31mCannot prompt for approval in non-interactive environment[39m+[2m↳[22m [2mTo skip prompts in CI/CD, add [90m--yes[39m; to pre-approve commands, run [90mwt hook approvals add[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__user_prefix_skips_approval.snap b/tests/snapshots/integration__integration_tests__approval_ui__user_prefix_skips_approval.snapnew file mode 100644index 000000000..4783fc399--- /dev/null+++ b/tests/snapshots/integration__integration_tests__approval_ui__user_prefix_skips_approval.snap@@ -0,0 +1,36 @@+---+source: tests/integration_tests/approval_ui.rs+info:+ program: wt+ args:+ - hook+ - pre-merge+ - "user:test"+ env:+ APPDATA: "[TEST_CONFIG_HOME]"+ CLICOLOR_FORCE: "1"+ COLUMNS: "150"+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"+ GIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"+ HOME: "[TEST_HOME]"+ LANG: C+ LC_ALL: C+ PATH: "[PATH]"+ RUST_LOG: warn+ SOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"+---+success: true+exit_code: 0+----- stdout -----++----- stderr -----+[36m◎[39m [36mRunning pre-merge [1muser:test[22m:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'user test'[0m[2m+[0muser testdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__yes_bypasses_tty_check.snap b/tests/snapshots/integration__integration_tests__approval_ui__yes_bypasses_tty_check.snapindex 15046b1ee..f2e9101b7 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__yes_bypasses_tty_check.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__yes_bypasses_tty_check.snap@@ -32,7 +32,7 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎[39m [36mRunning project post-create:[39m+[36m◎[39m [36mRunning post-create [1mproject hook[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m[0mtest command[32m✓[39m [32mCreated new worktree for [1mtest-yes-tty[22m from [1mmain[22m @ [1m_REPO_.test-yes-tty[22m[39mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__yes_does_not_save_approvals_first_run.snap b/tests/snapshots/integration__integration_tests__approval_ui__yes_does_not_save_approvals_first_run.snapindex 0486e945c..fca85358e 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__yes_does_not_save_approvals_first_run.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__yes_does_not_save_approvals_first_run.snap@@ -32,7 +32,7 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎[39m [36mRunning project post-create:[39m+[36m◎[39m [36mRunning post-create [1mproject hook[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m [0m[2m[36m>[0m[2m output.txt[0m[32m✓[39m [32mCreated new worktree for [1mtest-yes[22m from [1mmain[22m @ [1m_REPO_.test-yes[22m[39m[2m↳[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --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.snapindex 22daabac3..4bbd35660 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@@ -38,7 +38,7 @@ exit_code: 1[32m✓[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22m-[36m◎[39m [36mRunning project post-merge:[39m+[36m◎[39m [36mRunning post-merge [1mproject hook[22m:[39m[107m [0m [2m[0m[2m[34mexit[0m[2m 1[0m[33m▲[39m [33mCommand failed: exit status: 1[39m[31m✗[39m [31mpost-merge command failed: exit status: 1[39mdiff --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.snapindex a4c8cd761..8fabefd59 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@@ -38,7 +38,7 @@ exit_code: 0[32m✓[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22m-[36m◎[39m [36mRunning project post-merge [1mnotify[22m:[39m+[36m◎[39m [36mRunning post-merge [1mproject:notify[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Merge to main complete'[0m[2m [0m[2m[36m>[0m[2m notify.txt-[0m[36m◎[39m [36mRunning project post-merge [1mdeploy[22m:[39m+[0m[36m◎[39m [36mRunning post-merge [1mproject:deploy[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Deploying branch feature'[0m[2m [0m[2m[36m>[0m[2m deploy.txtdiff --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.snapindex f02f76ab6..90defff7c 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@@ -38,5 +38,5 @@ exit_code: 0[32m✓[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22m-[36m◎[39m [36mRunning project post-merge:[39m+[36m◎[39m [36mRunning post-merge [1mproject hook[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'merged feature to main'[0m[2m [0m[2m[36m>[0m[2m post-merge-ran.txtdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_from_main_branch.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_from_main_branch.snapindex c8fbf0764..1d18fdee3 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_from_main_branch.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_from_main_branch.snap@@ -32,5 +32,5 @@ exit_code: 0----- stderr -----[2m○[22m Already up to date with [1mmain[22m (no new commits, no rebase needed)[2m○[22m Worktree preserved (main worktree)-[36m◎[39m [36mRunning project post-merge:[39m+[36m◎[39m [36mRunning post-merge [1mproject hook[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'post-merge ran from main'[0m[2m [0m[2m[36m>[0m[2m post-merge-ran.txtdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_with_nothing_to_merge.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_with_nothing_to_merge.snapindex 3f29b2b0a..ac7dd7c43 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_with_nothing_to_merge.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_with_nothing_to_merge.snap@@ -34,5 +34,5 @@ exit_code: 0[2m○[22m Already up to date with [1mmain[22m (no new commits, no rebase needed)[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22m-[36m◎[39m [36mRunning project post-merge:[39m+[36m◎[39m [36mRunning post-merge [1mproject hook[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'post-merge ran'[0m[2m [0m[2m[36m>[0m[2m post-merge-ran.txtdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snapindex ec5308fb5..0ba34f6f2 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap@@ -33,7 +33,7 @@ exit_code: 1----- stderr -----[33m▲[39m [33mAuto-staging 1 untracked path:[39m[107m [0m feature.txt-[36m◎[39m [36mRunning project pre-commit:[39m+[36m◎[39m [36mRunning pre-commit [1mproject hook[22m:[39m[107m [0m [2m[0m[2m[34mexit[0m[2m 1[0m[31m✗[39m [31mpre-commit command failed: exit status: 1[39m[2m↳[22m [2mTo skip pre-commit hooks, re-run with [90m--no-verify[39m[22mdiff --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.snapindex ac3f423d0..ccd911bcd 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@@ -33,7 +33,7 @@ exit_code: 0----- stderr -----[33m▲[39m [33mAuto-staging 1 untracked path:[39m[107m [0m feature.txt-[36m◎[39m [36mRunning project pre-commit:[39m+[36m◎[39m [36mRunning pre-commit [1mproject hook[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Pre-commit check passed'[0m[2m[0mPre-commit check passed[36m◎[39m [36mCommitting changes with default message... [90m(1 file, [32m+1[39m, no squashing needed[39m[90m)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snapindex 02fd69237..24f10adb9 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap@@ -31,7 +31,7 @@ exit_code: 1----- stdout ---------- stderr ------[36m◎[39m [36mRunning project pre-merge:[39m+[36m◎[39m [36mRunning pre-merge [1mproject hook[22m:[39m[107m [0m [2m[0m[2m[34mexit[0m[2m 1[0m[31m✗[39m [31mpre-merge command failed: exit status: 1[39m[2m↳[22m [2mTo skip pre-merge hooks, re-run with [90m--no-verify[39m[22mdiff --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.snapindex 94725fc99..f2adae216 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@@ -31,11 +31,11 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎[39m [36mRunning project pre-merge [1mformat[22m:[39m+[36m◎[39m [36mRunning pre-merge [1mproject:format[22m:[39m[107m [0m [2m[0m[2m[34mexit[0m[2m 0-[0m[36m◎[39m [36mRunning project pre-merge [1mlint[22m:[39m+[0m[36m◎[39m [36mRunning pre-merge [1mproject:lint[22m:[39m[107m [0m [2m[0m[2m[34mexit[0m[2m 0-[0m[36m◎[39m [36mRunning project pre-merge [1mtest[22m:[39m+[0m[36m◎[39m [36mRunning pre-merge [1mproject:test[22m:[39m[107m [0m [2m[0m[2m[34mexit[0m[2m 0[0m[36m◎[39m [36mMerging 1 commit to [1mmain[22m @ [2m4a48dbd[22m (no commit/squash/rebase needed)[39m[107m [0m * [33m4a48dbd[m Add feature filediff --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.snapindex c51fbf860..90ef8e3ee 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@@ -31,7 +31,7 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎[39m [36mRunning project pre-merge:[39m+[36m◎[39m [36mRunning pre-merge [1mproject hook[22m:[39m[107m [0m [2m[0m[2m[34mexit[0m[2m 0[0m[36m◎[39m [36mMerging 1 commit to [1mmain[22m @ [2m4f5863f[22m (no commit/squash/rebase needed)[39m[107m [0m * [33m4f5863f[m Add feature filediff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snapindex ffad989cb..6242c8946 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap@@ -31,7 +31,7 @@ exit_code: 1----- stdout ---------- stderr ------[36m◎[39m [36mRunning project pre-commit:[39m+[36m◎[39m [36mRunning pre-commit [1mproject hook[22m:[39m[107m [0m [2m[0m[2m[34mexit[0m[2m 1[0m[31m✗[39m [31mpre-commit command failed: exit status: 1[39m[2m↳[22m [2mTo skip pre-commit hooks, re-run with [90m--no-verify[39m[22mdiff --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.snapindex e7e5c2946..9a70fac65 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@@ -31,7 +31,7 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎[39m [36mRunning project pre-commit:[39m+[36m◎[39m [36mRunning pre-commit [1mproject hook[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Pre-commit check passed'[0m[2m[0mPre-commit check passed[36m◎[39m [36mMerging 1 commit to [1mmain[22m @ [2mef627f5[22m (no commit/squash/rebase needed)[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snapindex bd6802252..f34538830 100644--- a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap@@ -43,7 +43,7 @@ exit_code: 0[107m [0m - Add JWT encoding/decoding with signature verification[107m [0m - Create test suite covering all authentication flows[32m✓[39m [32mSquashed @ [2m85d3884[22m[39m-[36m◎[39m [36mRunning project pre-merge [1mtest[22m:[39m+[36m◎[39m [36mRunning pre-merge [1mproject:test[22m:[39m[107m [0m [2m[0m[2m[34mcargo[0m[2m test[0m Finished test [unoptimized + debuginfo] target(s) in 0.12sRunning unittests src/lib.rs (target/debug/deps/worktrunk-abc123)@@ -55,7 +55,7 @@ test auth::tests::test_token_refresh ... oktest auth::tests::test_token_validation ... oktest result: ok. 18 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.08s-[36m◎[39m [36mRunning project pre-merge [1mlint[22m:[39m+[36m◎[39m [36mRunning pre-merge [1mproject:lint[22m:[39m[107m [0m [2m[0m[2m[34mcargo[0m[2m clippy[0m Checking worktrunk v0.1.0Finished dev [unoptimized + debuginfo] target(s) in 1.23s@@ -68,7 +68,7 @@ test result: ok. 18 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; fin[32m✓[39m [32mMerged to [1mmain[22m [90m(1 commit, 3 files, [32m+33[39m[39m[90m)[39m[39m[36m◎ Removing [1mfeature-auth[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22m-[36m◎[39m [36mRunning project post-merge [1minstall[22m:[39m+[36m◎[39m [36mRunning post-merge [1mproject:install[22m:[39m[107m [0m [2m[0m[2m[34mcargo[0m[2m install [0m[2m[36m--path[0m[2m .[0m Installing worktrunk v0.1.0Compiling worktrunk v0.1.0diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_post_create.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_post_create.snapindex 5a106dcb0..4a04bae49 100644--- a/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_post_create.snap+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_post_create.snap@@ -32,12 +32,12 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎[39m [36mRunning project post-create [1minstall[22m:[39m+[36m◎[39m [36mRunning post-create [1mproject:install[22m:[39m[107m [0m [2m[0m[2m[34muv[0m[2m syncResolved 24 packages in 145msInstalled 24 packages in 1.2s[32m✓[39m [32mCreated new worktree for [1mfeature-x[22m from [1mmain[22m @ [1m_REPO_.feature-x[22m[39m[2m↳[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22m-[36m◎[39m [36mRunning project post-start [1mdev[22m:[39m+[36m◎[39m [36mRunning post-start [1mproject:dev[22m:[39m[107m [0m [2m[0m[2m[34muv[0m[2m run devdiff --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.snapindex 3315b339e..de45bc842 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@@ -38,7 +38,7 @@ exit_code: 0[107m [0m Implement login and token refresh endpoints with JWT validation.[107m [0m Includes comprehensive test coverage and input validation.[32m✓[39m [32mSquashed @ [2m7323bc5[22m[39m-[36m◎[39m [36mRunning project pre-merge [1mtest[22m:[39m+[36m◎[39m [36mRunning pre-merge [1mproject:test[22m:[39m[107m [0m [2m[0m[2m[34muv[0m[2m run pytest============================= test session starts ==============================@@ -50,7 +50,7 @@ tests/test_auth.py::test_token_validation PASSED [100%]============================== 3 passed in 0.8s ===============================-[36m◎[39m [36mRunning project pre-merge [1mlint[22m:[39m+[36m◎[39m [36mRunning pre-merge [1mproject:lint[22m:[39m[107m [0m [2m[0m[2m[34muv[0m[2m run ruff checkAll checks passed!diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap b/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snapindex a4fbec8a6..56c0e7c31 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap@@ -31,9 +31,9 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎[39m [36mRunning project post-create:[39m+[36m◎[39m [36mRunning post-create [1mproject hook[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Setup done'[0m[2m [0m[2m[36m>[0m[2m setup.txt[0m[32m✓[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m[2m↳[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22m-[36m◎[39m [36mRunning project post-start [1mserver[22m:[39m+[36m◎[39m [36mRunning post-start [1mproject:server[22m:[39m[107m [0m [2m[0m[2m[34msleep[0m[2m 0.05 [0m[2m[36m&&[0m[2m [0m[2m[34mecho[0m[2m [0m[2m[32m'Server running'[0m[2m [0m[2m[36m>[0m[2m server.txtdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap b/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snapindex efdbcbb11..457ac8637 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap@@ -34,7 +34,7 @@ exit_code: 0----- stderr -----[32m✓[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m-[36m◎[39m [36mRunning project post-start:[39m+[36m◎[39m [36mRunning post-start [1mproject hook[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Background task'[0m[2m [0m[2m[36m>[0m[2m background.txt[36m◎[39m [36mExecuting (--execute):[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Execute flag'[0m[2m [0m[2m[36m>[0m[2m execute.txtdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_default_branch_template.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_default_branch_template.snapindex 3f6beee29..238efdc76 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_default_branch_template.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_default_branch_template.snap@@ -32,7 +32,7 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎[39m [36mRunning project post-create:[39m+[36m◎[39m [36mRunning post-create [1mproject hook[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Default: main'[0m[2m [0m[2m[36m>[0m[2m default.txt[0m[32m✓[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m[2m↳[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snapindex e46e71ae3..a2fa63321 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap@@ -31,7 +31,7 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎[39m [36mRunning project post-create:[39m+[36m◎[39m [36mRunning post-create [1mproject hook[22m:[39m[107m [0m [2m[0m[2m[34mexit[0m[2m 1[0m[33m▲[39m [33mCommand failed: exit status: 1[39m[32m✓[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_git_variables_template.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_git_variables_template.snapindex 7a5569378..f4d8618ed 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_git_variables_template.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_git_variables_template.snap@@ -32,13 +32,13 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎[39m [36mRunning project post-create [1mcommit[22m:[39m+[36m◎[39m [36mRunning post-create [1mproject:commit[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Commit: 5caad75ed9319b7bd5c35c626d7051d252f987e7'[0m[2m [0m[2m[36m>[0m[2m git_vars.txt-[0m[36m◎[39m [36mRunning project post-create [1mshort[22m:[39m+[0m[36m◎[39m [36mRunning post-create [1mproject:short[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Short: 5caad75'[0m[2m [0m[2m[36m>>[0m[2m git_vars.txt-[0m[36m◎[39m [36mRunning project post-create [1mremote[22m:[39m+[0m[36m◎[39m [36mRunning post-create [1mproject:remote[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Remote: origin'[0m[2m [0m[2m[36m>>[0m[2m git_vars.txt-[0m[36m◎[39m [36mRunning project post-create [1mworktree_name[22m:[39m+[0m[36m◎[39m [36mRunning post-create [1mproject:worktree_name[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Worktree Name: repo.feature'[0m[2m [0m[2m[36m>>[0m[2m git_vars.txt[0m[32m✓[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m[2m↳[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiline_control_structure.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiline_control_structure.snapindex cc510a3af..8f0346b33 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiline_control_structure.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiline_control_structure.snap@@ -31,7 +31,7 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎[39m [36mRunning project post-create:[39m+[36m◎[39m [36mRunning post-create [1mproject hook[22m:[39m[107m [0m [2m[0m[2m[35mif[0m[2m [ ! -f test.txt ]; [0m[2m[35mthen[0m[2m[0m[2m[107m [0m [2m [0m[2m[34mecho[0m[2m [0m[2m[32m'File does not exist'[0m[2m [0m[2m[36m>[0m[2m result.txt[107m [0m [2m[0m[2m[34melse[0m[2mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snapindex 0270dbfb9..012035cb4 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap@@ -31,10 +31,10 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎[39m [36mRunning project post-create [1minstall[22m:[39m+[36m◎[39m [36mRunning post-create [1mproject:install[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Installing deps'[0m[2m[0mInstalling deps-[36m◎[39m [36mRunning project post-create [1msetup[22m:[39m+[36m◎[39m [36mRunning post-create [1mproject:setup[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Running setup'[0m[2m[0mRunning setup[32m✓[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snapindex efac0ae7a..7c828abb9 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snap@@ -31,7 +31,7 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎[39m [36mRunning project post-create:[39m+[36m◎[39m [36mRunning post-create [1mproject hook[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Setup complete'[0m[2m[0mSetup complete[32m✓[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snapindex 0ccfc7abd..8342d65e6 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap@@ -31,15 +31,15 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎[39m [36mRunning project post-create [1mrepo[22m:[39m+[36m◎[39m [36mRunning post-create [1mproject:repo[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Repo: repo'[0m[2m [0m[2m[36m>[0m[2m info.txt-[0m[36m◎[39m [36mRunning project post-create [1mbranch[22m:[39m+[0m[36m◎[39m [36mRunning post-create [1mproject:branch[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Branch: feature/test'[0m[2m [0m[2m[36m>>[0m[2m info.txt-[0m[36m◎[39m [36mRunning project post-create [1mhash_port[22m:[39m+[0m[36m◎[39m [36mRunning post-create [1mproject:hash_port[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Port: 18064'[0m[2m [0m[2m[36m>>[0m[2m info.txt-[0m[36m◎[39m [36mRunning project post-create [1mworktree[22m:[39m+[0m[36m◎[39m [36mRunning post-create [1mproject:worktree[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Worktree: _REPO_.feature-test'[0m[2m [0m[2m[36m>>[0m[2m info.txt-[0m[36m◎[39m [36mRunning project post-create [1mroot[22m:[39m+[0m[36m◎[39m [36mRunning post-create [1mproject:root[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Root: _REPO_'[0m[2m [0m[2m[36m>>[0m[2m info.txt[0m[32m✓[39m [32mCreated new worktree for [1mfeature/test[22m from [1mmain[22m @ [1m_REPO_.feature-test[22m[39m[2m↳[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_upstream_template.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_upstream_template.snapindex ca1ad36a4..e8e327d61 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_upstream_template.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_upstream_template.snap@@ -32,7 +32,7 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎[39m [36mRunning project post-create:[39m+[36m◎[39m [36mRunning post-create [1mproject hook[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Upstream: '[0m[2m [0m[2m[36m>[0m[2m upstream.txt[0m[32m✓[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m[2m↳[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snapindex 7d4e05087..ea0fb995a 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snap@@ -33,7 +33,7 @@ exit_code: 0----- stderr -----[32m✓[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m[2m↳[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22m-[36m◎[39m [36mRunning project post-start:[39m+[36m◎[39m [36mRunning post-start [1mproject hook[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m 'line1[107m [0m [2m[0m[2m[34mline2[0m[2m[107m [0m [2m[0m[2m[34mline3[0m[2m' | grep line2 > filtered.txtdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_create_with_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_create_with_command.snapindex 7f40e35cd..9a1f1a891 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_create_with_command.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_create_with_command.snap@@ -33,5 +33,5 @@ exit_code: 0----- stderr -----[32m✓[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m[2m↳[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22m-[36m◎[39m [36mRunning project post-start:[39m+[36m◎[39m [36mRunning post-start [1mproject hook[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'POST-START-RAN'[0m[2m [0m[2m[36m>[0m[2m post_start_marker.txtdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snapindex fa3d57d82..82449aec7 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snap@@ -33,5 +33,5 @@ exit_code: 0----- stderr -----[32m✓[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m[2m↳[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22m-[36m◎[39m [36mRunning project post-start:[39m+[36m◎[39m [36mRunning post-start [1mproject hook[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m 'unclosed quotediff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snapindex bdf92d2bc..e60c54ee6 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snap@@ -33,5 +33,5 @@ exit_code: 0----- stderr -----[32m✓[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m[2m↳[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22m-[36m◎[39m [36mRunning project post-start:[39m+[36m◎[39m [36mRunning post-start [1mproject hook[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'stdout output'[0m[2m [0m[2m[36m&&[0m[2m [0m[2m[34mecho[0m[2m [0m[2m[32m'stderr output'[0m[2m >&2diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_with_newlines.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_with_newlines.snapindex ee568d6ea..a58304a71 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_with_newlines.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_with_newlines.snap@@ -33,7 +33,7 @@ exit_code: 0----- stderr -----[32m✓[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m[2m↳[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22m-[36m◎[39m [36mRunning project post-start:[39m+[36m◎[39m [36mRunning post-start [1mproject hook[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'first line'[0m[2m [0m[2m[36m>[0m[2m multiline.txt[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'second line'[0m[2m [0m[2m[36m>>[0m[2m multiline.txt[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'third line'[0m[2m [0m[2m[36m>>[0m[2m multiline.txtdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snapindex fdb6347e2..22cd57516 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap@@ -33,7 +33,7 @@ exit_code: 0----- stderr -----[32m✓[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m[2m↳[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22m-[36m◎[39m [36mRunning project post-start [1mtask1[22m:[39m+[36m◎[39m [36mRunning post-start [1mproject:task1[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Task 1 running'[0m[2m [0m[2m[36m>[0m[2m task1.txt-[36m◎[39m [36mRunning project post-start [1mtask2[22m:[39m+[36m◎[39m [36mRunning post-start [1mproject:task2[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Task 2 running'[0m[2m [0m[2m[36m>[0m[2m task2.txtdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snapindex fed639a0b..184548a9a 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap@@ -33,9 +33,9 @@ exit_code: 0----- stderr -----[32m✓[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m[2m↳[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22m-[36m◎[39m [36mRunning project post-start [1mtask1[22m:[39m+[36m◎[39m [36mRunning post-start [1mproject:task1[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'TASK1_OUTPUT'[0m[2m-[36m◎[39m [36mRunning project post-start [1mtask2[22m:[39m+[36m◎[39m [36mRunning post-start [1mproject:task2[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'TASK2_OUTPUT'[0m[2m-[36m◎[39m [36mRunning project post-start [1mtask3[22m:[39m+[36m◎[39m [36mRunning post-start [1mproject:task3[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'TASK3_OUTPUT'[0m[2mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snapindex 92cd4bac3..bef471213 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snap@@ -33,5 +33,5 @@ exit_code: 0----- stderr -----[32m✓[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m[2m↳[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22m-[36m◎[39m [36mRunning project post-start:[39m+[36m◎[39m [36mRunning post-start [1mproject hook[22m:[39m[107m [0m [2m[0m[2m[34msleep[0m[2m 0.1 [0m[2m[36m&&[0m[2m [0m[2m[34mecho[0m[2m [0m[2m[32m'Background task done'[0m[2m [0m[2m[36m>[0m[2m background.txtdiff --git a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_executes.snap b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_executes.snapindex 6e88d8a2d..233729475 100644--- a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_executes.snap+++ b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_executes.snap@@ -32,7 +32,7 @@ exit_code: 0----- stderr -----[36m◎[39m [36mRemoving [1mfeature-hook[22m worktree...[39m-[36m◎[39m [36mRunning project pre-remove:[39m+[36m◎[39m [36mRunning pre-remove [1mproject hook[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'About to remove worktree'[0m[2m[0mAbout to remove worktree[32m✓ Removed [1mfeature-hook[22m worktree & branch (same commit as [1mmain[22m,[39m [2m_[22m[32m)[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_failure_aborts.snap b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_failure_aborts.snapindex 0a35fe14d..4fa6c676d 100644--- a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_failure_aborts.snap+++ b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_failure_aborts.snap@@ -32,7 +32,7 @@ exit_code: 1----- stderr -----[36m◎[39m [36mRemoving [1mfeature-fail[22m worktree...[39m-[36m◎[39m [36mRunning project pre-remove:[39m+[36m◎[39m [36mRunning pre-remove [1mproject hook[22m:[39m[107m [0m [2m[0m[2m[34mexit[0m[2m 1[0m[31m✗[39m [31mpre-remove command failed: exit status: 1[39m[2m↳[22m [2mTo skip pre-remove hooks, re-run with [90m--no-verify[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_runs_for_detached_head.snap b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_runs_for_detached_head.snapindex 210d12872..ddb9f2736 100644--- a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_runs_for_detached_head.snap+++ b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_runs_for_detached_head.snap@@ -31,6 +31,6 @@ exit_code: 0----- stderr -----[36m◎[39m [36mRemoving current worktree...[39m-[36m◎[39m [36mRunning project pre-remove:[39m+[36m◎[39m [36mRunning pre-remove [1mproject hook[22m:[39m[107m [0m [2m[0m[2m[34mtouch[0m[2m _REPO_/m.txt[0m[32m✓[39m [32mRemoved worktree (detached HEAD, no branch to delete)[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_runs_for_detached_head_background.snap b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_runs_for_detached_head_background.snapindex fafaedbfd..286a58465 100644--- a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_runs_for_detached_head_background.snap+++ b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_runs_for_detached_head_background.snap@@ -29,6 +29,6 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎[39m [36mRunning project pre-remove:[39m+[36m◎[39m [36mRunning pre-remove [1mproject hook[22m:[39m[107m [0m [2m[0m[2m[34mtouch[0m[2m _REPO_/detached-bg-hook-marker.txt[0m[36m◎[39m [36mRemoving worktree in background (detached HEAD, no branch to delete)[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_template_variables.snap b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_template_variables.snapindex c69378993..0da671953 100644--- a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_template_variables.snap+++ b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_template_variables.snap@@ -32,13 +32,13 @@ exit_code: 0----- stderr -----[36m◎[39m [36mRemoving [1mfeature-templates[22m worktree...[39m-[36m◎[39m [36mRunning project pre-remove [1mbranch[22m:[39m+[36m◎[39m [36mRunning pre-remove [1mproject:branch[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Branch: feature-templates'[0m[2m[0mBranch: feature-templates-[36m◎[39m [36mRunning project pre-remove [1mworktree[22m:[39m+[36m◎[39m [36mRunning pre-remove [1mproject:worktree[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Worktree: _REPO_.feature-templates'[0m[2m[0mWorktree: _REPO_.feature-templates-[36m◎[39m [36mRunning project pre-remove [1mworktree_name[22m:[39m+[36m◎[39m [36mRunning pre-remove [1mproject:worktree_name[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Name: repo.feature-templates'[0m[2m[0mName: repo.feature-templates[32m✓ Removed [1mfeature-templates[22m worktree & branch (same commit as [1mmain[22m,[39m [2m_[22m[32m)[39mdiff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_and_project_post_start.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_and_project_post_start.snapindex 52d9cee97..95009da5a 100644--- a/tests/snapshots/integration__integration_tests__user_hooks__user_and_project_post_start.snap+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_and_project_post_start.snap@@ -33,7 +33,7 @@ exit_code: 0----- stderr -----[32m✓[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m[2m↳[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22m-[36m◎[39m [36mRunning user post-start [1mbg[22m:[39m+[36m◎[39m [36mRunning post-start [1muser:bg[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'USER_POST_START'[0m[2m [0m[2m[36m>[0m[2m user_bg.txt-[36m◎[39m [36mRunning project post-start:[39m+[36m◎[39m [36mRunning post-start [1mproject hook[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'PROJECT_POST_START'[0m[2m [0m[2m[36m>[0m[2m project_bg.txtdiff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_hook_template_vars.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_hook_template_vars.snapindex 8f933bdd2..c7b2fb305 100644--- a/tests/snapshots/integration__integration_tests__user_hooks__user_hook_template_vars.snap+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_hook_template_vars.snap@@ -31,7 +31,7 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎[39m [36mRunning user post-create [1mvars[22m:[39m+[36m◎[39m [36mRunning post-create [1muser:vars[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'repo=repo branch=feature'[0m[2m [0m[2m[36m>[0m[2m template_vars.txt[0m[32m✓[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m[2m↳[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_hooks_before_project.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_hooks_before_project.snapindex aa4a45642..36a4d9ca4 100644--- a/tests/snapshots/integration__integration_tests__user_hooks__user_hooks_before_project.snap+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_hooks_before_project.snap@@ -31,9 +31,9 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎[39m [36mRunning user post-create [1mlog[22m:[39m+[36m◎[39m [36mRunning post-create [1muser:log[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'USER_HOOK'[0m[2m [0m[2m[36m>>[0m[2m hook_order.txt-[0m[36m◎[39m [36mRunning project post-create:[39m+[0m[36m◎[39m [36mRunning post-create [1mproject hook[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'PROJECT_HOOK'[0m[2m [0m[2m[36m>>[0m[2m hook_order.txt[0m[32m✓[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m[2m↳[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_hooks_no_approval.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_hooks_no_approval.snapindex fdbb83cb0..04399e445 100644--- a/tests/snapshots/integration__integration_tests__user_hooks__user_hooks_no_approval.snap+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_hooks_no_approval.snap@@ -31,7 +31,7 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎[39m [36mRunning user post-create [1msetup[22m:[39m+[36m◎[39m [36mRunning post-create [1muser:setup[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'NO_APPROVAL_NEEDED'[0m[2m [0m[2m[36m>[0m[2m no_approval.txt[0m[32m✓[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m[2m↳[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_post_create_executes.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_post_create_executes.snapindex 5eb847663..6a8e01aed 100644--- a/tests/snapshots/integration__integration_tests__user_hooks__user_post_create_executes.snap+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_post_create_executes.snap@@ -31,7 +31,7 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎[39m [36mRunning user post-create [1mlog[22m:[39m+[36m◎[39m [36mRunning post-create [1muser:log[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'USER_POST_CREATE_RAN'[0m[2m [0m[2m[36m>[0m[2m user_hook_marker.txt[0m[32m✓[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m[2m↳[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_post_create_failure.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_post_create_failure.snapindex 489657972..2c4e3d4e7 100644--- a/tests/snapshots/integration__integration_tests__user_hooks__user_post_create_failure.snap+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_post_create_failure.snap@@ -31,7 +31,7 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎[39m [36mRunning user post-create [1mfailing[22m:[39m+[36m◎[39m [36mRunning post-create [1muser:failing[22m:[39m[107m [0m [2m[0m[2m[34mexit[0m[2m 1[0m[33m▲[39m [33mCommand [1mfailing[22m failed: exit status: 1[39m[32m✓[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39mdiff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_post_merge_executes.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_post_merge_executes.snapindex 4050cd45a..f79f39d9c 100644--- a/tests/snapshots/integration__integration_tests__user_hooks__user_post_merge_executes.snap+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_post_merge_executes.snap@@ -38,5 +38,5 @@ exit_code: 0[107m [0m 1 file changed, 1 insertion(+)[32m✓[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m[2m○[22m Worktree preserved (--no-remove)-[36m◎[39m [36mRunning user post-merge [1mnotify[22m:[39m+[36m◎[39m [36mRunning post-merge [1muser:notify[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'USER_POST_MERGE_RAN'[0m[2m [0m[2m[36m>[0m[2m user_postmerge.txtdiff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_post_start_executes.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_post_start_executes.snapindex 159fec153..5f2fdd262 100644--- a/tests/snapshots/integration__integration_tests__user_hooks__user_post_start_executes.snap+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_post_start_executes.snap@@ -33,5 +33,5 @@ exit_code: 0----- stderr -----[32m✓[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m[2m↳[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22m-[36m◎[39m [36mRunning user post-start [1mbg[22m:[39m+[36m◎[39m [36mRunning post-start [1muser:bg[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'USER_POST_START_RAN'[0m[2m [0m[2m[36m>[0m[2m user_bg_marker.txtdiff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_commit_executes.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_commit_executes.snapindex 15138dc71..6dbcaaf30 100644--- a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_commit_executes.snap+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_commit_executes.snap@@ -34,7 +34,7 @@ exit_code: 0----- stderr -----[33m▲[39m [33mAuto-staging 1 untracked path:[39m[107m [0m uncommitted.txt-[36m◎[39m [36mRunning user pre-commit [1mlint[22m:[39m+[36m◎[39m [36mRunning pre-commit [1muser:lint[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'USER_PRE_COMMIT_RAN'[0m[2m [0m[2m[36m>[0m[2m user_precommit.txt[0m[36m◎[39m [36mCommitting changes with default message... [90m(1 file, [32m+1[39m, no squashing needed[39m[90m)[39m[39m[2m↳[22m [2mUsing fallback commit message. Run [90mwt config --help[39m for LLM setup guide[22mdiff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_commit_failure.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_commit_failure.snapindex c45a2db0c..810212966 100644--- a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_commit_failure.snap+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_commit_failure.snap@@ -34,7 +34,7 @@ exit_code: 1----- stderr -----[33m▲[39m [33mAuto-staging 1 untracked path:[39m[107m [0m uncommitted.txt-[36m◎[39m [36mRunning user pre-commit [1mlint[22m:[39m+[36m◎[39m [36mRunning pre-commit [1muser:lint[22m:[39m[107m [0m [2m[0m[2m[34mexit[0m[2m 1[0m[31m✗[39m [31mpre-commit command failed: [1mlint[22m: exit status: 1[39m[2m↳[22m [2mTo skip pre-commit hooks, re-run with [90m--no-verify[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_merge_executes.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_merge_executes.snapindex 2ea9de72b..9336dfcb5 100644--- a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_merge_executes.snap+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_merge_executes.snap@@ -32,7 +32,7 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎[39m [36mRunning user pre-merge [1mcheck[22m:[39m+[36m◎[39m [36mRunning pre-merge [1muser:check[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'USER_PRE_MERGE_RAN'[0m[2m [0m[2m[36m>[0m[2m user_premerge.txt[0m[36m◎[39m [36mMerging 1 commit to [1mmain[22m @ [2md233817[22m (no commit/squash/rebase needed)[39m[107m [0m * [33md233817[m Add featurediff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_merge_failure.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_merge_failure.snapindex 078d2c992..421e930cb 100644--- a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_merge_failure.snap+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_merge_failure.snap@@ -32,7 +32,7 @@ exit_code: 1----- stdout ---------- stderr ------[36m◎[39m [36mRunning user pre-merge [1mcheck[22m:[39m+[36m◎[39m [36mRunning pre-merge [1muser:check[22m:[39m[107m [0m [2m[0m[2m[34mexit[0m[2m 1[0m[31m✗[39m [31mpre-merge command failed: [1mcheck[22m: exit status: 1[39m[2m↳[22m [2mTo skip pre-merge hooks, re-run with [90m--no-verify[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_remove_executes.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_remove_executes.snapindex 57886adc5..cd6ed3337 100644--- a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_remove_executes.snap+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_remove_executes.snap@@ -31,6 +31,6 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎[39m [36mRunning user pre-remove [1mcleanup[22m:[39m+[36m◎[39m [36mRunning pre-remove [1muser:cleanup[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'USER_PRE_REMOVE_RAN'[0m[2m [0m[2m[36m>[0m[2m ../user_preremove_marker.txt[0m[36m◎ Removing [1mfeature[22m worktree & branch in background (--force-delete)[39mdiff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_remove_failure.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_remove_failure.snapindex a784b6d4a..462044436 100644--- a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_remove_failure.snap+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_remove_failure.snap@@ -31,7 +31,7 @@ exit_code: 1----- stdout ---------- stderr ------[36m◎[39m [36mRunning user pre-remove [1mblock[22m:[39m+[36m◎[39m [36mRunning pre-remove [1muser:block[22m:[39m[107m [0m [2m[0m[2m[34mexit[0m[2m 1[0m[31m✗[39m [31mpre-remove command failed: [1mblock[22m: exit status: 1[39m[2m↳[22m [2mTo skip pre-remove hooks, re-run with [90m--no-verify[39m[22m