[aeppling]

Summary

• psql -h flag conflict + exclude_commands ignores env-var prefixed commands #917 part 2: PGPASSWORD=x psql -h localhost now correctly excluded by ["psql"] , env prefix is stripped before matching
• Support exclude_commands config for auto-rewrite hook #243 : ["git push"] now excludes git push origin main : matches against full command, not just first token
• bug(hooks): exclude_commands has no effect on rtk rewrite or hook output in 0.36.0 #1335 : ["^curl"] works as regex , patterns are compiled as regex instead of literal == comparison
• Invalid regex patterns (e.g. ["curl["]) fall back to prefix match with a stderr warning
• Non-regex patterns auto-anchor with ^ and \b to prevent substring false positives ("go" won't exclude golangci-lint)

Changes

Single file: src/discover/registry.rs

• ExcludePattern enum , compiled regex or prefix fallback, precompiled once per rewrite_command call
• compile_exclude_patterns() , anchoring logic + eprintln! on invalid regex
• is_excluded() , matches against env-stripped command using precompiled patterns
• Modified rewrite_segment_inner() to strip env prefix before exclude check

Test plan

• test_exclude_env_prefixed_command , PGPASSWORD=x psql excluded by ["psql"]
• test_exclude_subcommand_pattern , git push origin main excluded by ["git push"]
• test_exclude_regex_pattern , curl http://... excluded by ["^curl"]
• test_exclude_invalid_regex_fallback , invalid regex doesn't crash, falls back to prefix
• test_exclude_does_not_substring_match , "go" doesn't exclude golangci-lint
• All 4 pre-existing exclude tests still pass
• Full suite: 1597 passed, 0 failed

[pszymkowiak]

[w] wshm · Automated triage by AI

📊 Automated PR Analysis

🐛 Type	bug-fix
🟡 Risk	medium

Summary

Fixes the exclude_commands matching logic in the discover registry to handle env-prefixed commands (e.g., PGPASSWORD=x psql), multi-token subcommand patterns (e.g., "git push"), and regex patterns (e.g., "^curl"). Non-regex patterns are auto-anchored with ^ and \b to prevent substring false positives. Invalid regex patterns gracefully fall back to prefix matching with a warning.

Review Checklist

• Tests present
• Breaking change
• Docs updated

Linked issues: #917, #243, #1335

---

Analyzed automatically by wshm · This is an automated analysis, not a human review.

[pszymkowiak]

LGTM. Clean fix for 3 real user-visible regressions (#917, #243, #1335). ExcludePattern enum with Regex/Prefix fallback is a good design, regex::escape + auto-anchoring ^{esc}($|\s) correctly prevents substring false-positives ("go" no longer excludes golangci-lint). Env-prefix stripping via existing ENV_PREFIX regex is consistent with classify_command.

Verified locally:

• cargo test discover::registry → 232/232
• Rewrite still wraps env correctly: FOO=bar git status → FOO=bar rtk git status
• Docs updated in configuration.md + hooks/README.md

Non-blocking follow-ups:

1. test_exclude_invalid_regex_fallback passes for the wrong reason. "curl[" is not ^-prefixed, so it goes through regex::escape → ^curl\[($|\s) which is a valid regex matching literal curl[. The Prefix fallback path is never exercised. To actually test the fallback, use an anchored invalid pattern like "^curl[" (no escape → regex compile fails → ExcludePattern::Prefix branch).
2. compile_exclude_patterns runs on every rewrite_command call, so an invalid pattern in config.toml will eprintln! on every Bash command the hook intercepts. Consider log-once or compile-at-config-load for a follow-up.
3. Minor perf: regex re-compiled per call (~10-50µs for 3-5 patterns, negligible vs 10ms startup, but cache at Config level would be cleaner).