Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
fix: remove prefix filtering from HookCommandCompleter for shell consistency (#1627)
Maximilian Roose6c50672910a
diff --git a/src/completion.rs b/src/completion.rsindex 2e3fab334..9cb423cbc 100644--- a/src/completion.rs+++ b/src/completion.rs@@ -191,7 +191,7 @@ pub(crate) fn worktree_only_completer() -> ArgValueCompleter {})}-/// Hook command name completion for `wt step <hook-type> <name>`.+/// Hook command name completion for `wt hook <hook-type> <name>`./// Completes with command names from the project config for the hook type being invoked.pub(crate) fn hook_command_name_completer() -> ArgValueCompleter {ArgValueCompleter::new(HookCommandCompleter)@@ -207,79 +207,67 @@ impl ValueCompleter for HookCommandCompleter {return Vec::new();}- let prefix = current.to_string_lossy();- complete_hook_commands()- .into_iter()- .filter(|candidate| {- candidate- .get_value()- .to_string_lossy()- .starts_with(&*prefix)+ // Return all candidates without prefix filtering — let the shell apply its+ // own matching (substring in fish, fuzzy in zsh, prefix in bash). The+ // bash-specific prefix filter in maybe_handle_env_completion() handles bash.++ // Get the hook type from the command line context+ let hook_type = CONTEXT.with(|ctx| {+ ctx.borrow().as_ref().and_then(|ctx| {+ for hook in &[+ "post-create",+ "post-start",+ "pre-commit",+ "pre-merge",+ "post-merge",+ "pre-remove",+ ] {+ if ctx.contains(hook) {+ return Some(*hook);+ }+ }+ None})- .collect()- }-}+ });-fn complete_hook_commands() -> Vec<CompletionCandidate> {- // Get the hook type from the command line context- let hook_type = CONTEXT.with(|ctx| {- ctx.borrow().as_ref().and_then(|ctx| {- // Look for the hook subcommand in the args- for hook in &[- "post-create",- "post-start",- "pre-commit",- "pre-merge",- "post-merge",- "pre-remove",- ] {- if ctx.contains(hook) {- return Some(*hook);- }- }- None- })- });+ let Some(hook_type_str) = hook_type else {+ return Vec::new();+ };+ let Ok(hook_type) = hook_type_str.parse::<HookType>() else {+ return Vec::new();+ };- let Some(hook_type_str) = hook_type else {- return Vec::new();- };- let Ok(hook_type) = hook_type_str.parse::<HookType>() else {- return Vec::new();- };+ let mut candidates = Vec::new();++ let add_named_commands =+ |candidates: &mut Vec<_>, config: &worktrunk::config::CommandConfig| {+ candidates.extend(+ config+ .commands()+ .iter()+ .filter_map(|cmd| cmd.name.as_ref())+ .map(|name| CompletionCandidate::new(name.clone())),+ );+ };- let mut candidates = Vec::new();-- // Helper to extract named commands from a hook config- let add_named_commands =- |candidates: &mut Vec<_>, config: &worktrunk::config::CommandConfig| {- candidates.extend(- config- .commands()- .iter()- .filter_map(|cmd| cmd.name.as_ref())- .map(|name| CompletionCandidate::new(name.clone())),- );- };+ // Load user config and add user hook names+ if let Ok(user_config) = UserConfig::load()+ && let Some(config) = user_config.configs.hooks.get(hook_type)+ {+ add_named_commands(&mut candidates, config);+ }- // Load user config and add user hook names- // Uses overrides.hooks for completion (global hooks from user config file)- if let Ok(user_config) = UserConfig::load()- && let Some(config) = user_config.configs.hooks.get(hook_type)- {- add_named_commands(&mut candidates, config);- }+ // Load project config and add project hook names+ // Pass write_hints=false to avoid side effects during completion+ if let Ok(repo) = Repository::current()+ && let Ok(Some(project_config)) = ProjectConfig::load(&repo, false)+ && let Some(config) = project_config.hooks.get(hook_type)+ {+ add_named_commands(&mut candidates, config);+ }- // Load project config and add project hook names- // Pass write_hints=false to avoid side effects during completion- if let Ok(repo) = Repository::current()- && let Ok(Some(project_config)) = ProjectConfig::load(&repo, false)- && let Some(config) = project_config.hooks.get(hook_type)- {- add_named_commands(&mut candidates, config);+ candidates}-- candidates}#[derive(Clone, Copy)]diff --git a/tests/integration_tests/completion.rs b/tests/integration_tests/completion.rsindex 0f4f1ea2f..b04f1c2e4 100644--- a/tests/integration_tests/completion.rs+++ b/tests/integration_tests/completion.rs@@ -826,6 +826,71 @@ fn test_complete_hook_subcommands(repo: TestRepo) {assert!(!subcommands.contains(&"pre-merge"));}+/// Cross-shell completion contract for hook command names.+///+/// Same contract as branch completions (test_completion_cross_shell_filtering_contract):+/// - fish/zsh get ALL candidates (shell does its own substring/fuzzy matching)+/// - bash gets only prefix-filtered candidates (binary must filter)+#[rstest]+fn test_hook_command_completion_cross_shell_filtering_contract(repo: TestRepo) {+ repo.commit("initial");++ // Set up a project config with named pre-merge commands+ repo.write_project_config(+ r#"+[pre-merge]+test = "cargo test"+lint = "cargo clippy"+build = "cargo build"+"#,+ );++ // Prefix "te" — matches "test" but not "lint" or "build"+ for shell in ["fish", "zsh"] {+ let output = repo+ .completion_cmd_for_shell(&["wt", "hook", "pre-merge", "te"], shell)+ .output()+ .unwrap();+ assert!(output.status.success(), "{shell}: completion failed");+ let stdout = String::from_utf8_lossy(&output.stdout);+ let values = value_suggestions(&stdout);++ assert!(+ values.contains(&"test"),+ "{shell} should return 'test' (prefix match)\n{stdout}"+ );+ assert!(+ values.contains(&"lint"),+ "{shell} should return ALL candidates (shell does its own matching)\n{stdout}"+ );+ assert!(+ values.contains(&"build"),+ "{shell} should return ALL candidates\n{stdout}"+ );+ }++ let output = repo+ .completion_cmd_for_shell(&["wt", "hook", "pre-merge", "te"], "bash")+ .output()+ .unwrap();+ assert!(output.status.success());+ let stdout = String::from_utf8_lossy(&output.stdout);+ let values = value_suggestions(&stdout);++ assert!(+ values.contains(&"test"),+ "bash should return 'test' (prefix match)\n{stdout}"+ );+ assert!(+ !values.contains(&"lint"),+ "bash should NOT return 'lint' (not a prefix match)\n{stdout}"+ );+ assert!(+ !values.contains(&"build"),+ "bash should NOT return 'build' (not a prefix match)\n{stdout}"+ );+}+#[rstest]fn test_complete_init_shell_all_variations(repo: TestRepo) {repo.commit("initial");