[dwin-gharibi]

Closes #3663.

Summary

• rtk grep no longer claims -l, -m or -t — those letters are grep's
  --files-with-matches, grep's --max-count and rg's --type. The knobs keep their long
  names (--max-len, --max, --file-type).
• disable_help_flag on Grep and Ls, so clap stops claiming -h: it is --no-filename
  for grep and --human-readable for ls, not a help request. Follows the existing
  Commands::Psql precedent.
• -h is still treated as help for rg (where it genuinely is), and for grep it now
  suppresses the filename prefix in the compressed output, since RTK forces -H on the engine
  for its own parsing.

Test plan

• cargo fmt --all && cargo clippy --all-targets && cargo test
• Manual testing: rtk <command> output inspected

Unit tests (added, TDD — red before green)

src/main.rs:

• grep_does_not_swallow_engine_short_flags — -l, -m, -t all reach extra_args.
  Fails on develop.
• dash_h_reaches_the_proxied_tool — rtk grep -h … and rtk ls -h parse instead of
  triggering clap's help. Fails on develop.
• grep_long_options_still_parse — control: --max-len 40 --max 5 still bind rtk's own
  fields. Passes before and after.

src/cmds/system/search.rs:

• no_filename_flag_suppresses_the_prefix — -h, --no-filename and the -rh cluster
  suppress the filename prefix; -H still forces it on. Fails on develop.

Behavioural check against real grep / ls

Command	Before	After
grep -l 404 a.log b.log	no output, exit 1	2 filenames, identical
grep -m 1 hit m.txt	4 lines	1 line, identical
grep -m 2 hit m.txt	4 lines	2 lines, identical
grep -h 404 a.log b.log	rtk help page, exit 0	2 lines, no prefix, identical
grep -hn 404 a.log b.log	already correct	identical
grep --no-filename 404 a.log b.log	already correct	identical
ls -h	rtk help page	directory listing

Controls confirming nothing else moved: grep 404 a b (prefix still shown), grep -H 404 a,
grep -n 404 a, grep -c 404 a b, grep -l GET a b, grep -m1 hit m.txt — all identical
before and after. rtk grep --max-len 40 --max 5 404 a.log still honours rtk's own options.

Suite

cargo test --all: 2629 passed, 0 failed (2625 on develop, +4 from this PR).
cargo clippy --all-targets: clean. cargo fmt --all: clean.

[Copilot]

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.

[KuSh]

#3259 (merged 2026-08-29) dropped the -m short, #2628 (merged 2026-08-31) dropped -l and -t, and #3681 (merged 2026-09-12) moved search.rs onto the shared arg tokenizer, where -h already means no-filename for grep, so the search.rs hunks here target code that has been replaced. What develop still lacks is #[command(disable_help_flag = true)] on the Grep and Ls subcommands in src/main.rs: rtk grep -h 404 a.log b.log and rtk ls -h still print rtk's help and exit 0, which is #3663. Could you rebase onto current develop and narrow the PR to those two attributes plus the dash_h_reaches_the_proxied_tool parse test? It conflicts with develop in src/main.rs and search.rs. Thanks for the fix.

[KuSh]

Thank you for this. The fix landed through #4348 (merged 2026-10-14), which stops rtk claiming -h on grep and ls, together with #3259 (2026-08-28) and #3681 (2026-09-12), which free -m, -l and -t for the engine and honour -h and --no-filename in the compressed output. The parse and display tests this PR adds are already covered by tests on develop, and the commands in your table now behave like native grep and ls. If a case is still missed, please comment or reopen.