fix: preserve -- separator for cargo commands and silence fallback#326
Merged
pszymkowiak merged 1 commit intortk-ai:masterfrom Mar 6, 2026
Merged
Conversation
5 tasks
Two fixes for command passthrough issues: 1. Restore `--` separator stripped by clap (#287): When running `rtk cargo test -- --nocapture`, clap consumes `--` and passes only `["--nocapture"]` to cargo, which rejects it. Now detect `--` from the original command line and re-insert it in the correct position. 2. Remove noisy `[rtk: parse failed, running raw]` stderr message (#286): Unrecognized commands like `rtk make` or `rtk ruby` pass through silently via the fallback, matching the documented behavior. Fixes #286 Fixes #287
d2a9797 to
641720f
Compare
Collaborator
Collaborator
|
LGTM — verified locally on 0.27.0:
Clean fix — |
ahundt
added a commit
to ahundt/rtk
that referenced
this pull request
Mar 11, 2026
Incorporates 52 upstream commits (v0.27.0 → v0.28.2): - TOML filter DSL engine + 30 built-in filters (PRs rtk-ai#349, rtk-ai#351, rtk-ai#386) - Graphite CLI support (PR rtk-ai#290) - git commit -am/--amend fix via trailing_var_arg (PR rtk-ai#327) - restore_double_dash for cargo (PR rtk-ai#326) - gh -R/--repo passthrough, pr edit/comment fix (PRs rtk-ai#328, rtk-ai#332) - docker compose subcommand filtering (PR rtk-ai#336) - Telemetry tokens_saved + install_method (PRs rtk-ai#462, rtk-ai#469, rtk-ai#471) - proxy streaming (PR rtk-ai#268) - Diff limits increased (100→500 lines, 10→30 hunk lines) Conflict resolution (5 files): - cargo_cmd.rs: adopted upstream restore_double_dash, adapted streaming run_test() to use it, converted old split_at_double_dash tests - git.rs: adopted upstream simplified Commit unit variant (fixes -am), adapted all commit tests to flat args API, added 6 new edge case tests - init.rs: added TOML template generation alongside hook manifest - main.rs: merged both upstream (gt, toml_filter, verify) and hooks-v2 (cmd, hook, stream, pipe) modules, kept all tests from both sides - utils.rs: kept hooks-v2 command_in_path/which_command + upstream English docs Hook engine additions during merge: - Added gt to hook_lookup() whitelist with 4 routing test cases All 5 hook bug fixes from issue rtk-ai#361 preserved: 1. Streaming (stream.rs BufReader) 2. Handler coordination (parallel-merge + run_manifest_handlers on both paths) 3. Stderr deny (exit 2) 4. Routing whitelist (hook_lookup) 5. Vitest run injection 1182 tests pass (1 environment-dependent upstream test excluded).
ahundt
added a commit
to ahundt/rtk
that referenced
this pull request
Mar 11, 2026
Incorporates 52 upstream commits (v0.27.0 → v0.28.2): - TOML filter DSL engine + 30 built-in filters (PRs rtk-ai#349, rtk-ai#351, rtk-ai#386) - Graphite CLI support (PR rtk-ai#290) - git commit -am/--amend fix via trailing_var_arg (PR rtk-ai#327) - restore_double_dash for cargo (PR rtk-ai#326) - gh -R/--repo passthrough, pr edit/comment fix (PRs rtk-ai#328, rtk-ai#332) - docker compose subcommand filtering (PR rtk-ai#336) - Telemetry tokens_saved + install_method (PRs rtk-ai#462, rtk-ai#469, rtk-ai#471) - proxy streaming (PR rtk-ai#268) - Diff limits increased (100→500 lines, 10→30 hunk lines) Conflict resolution (5 files): - cargo_cmd.rs: adopted upstream restore_double_dash - git.rs: adopted upstream simplified Commit variant (fixes -am), fixed test_git_status_not_a_repo via GIT_DIR env override - init.rs: added TOML template generation alongside hook manifest, made resolve_claude_dir pub(crate) for config/mod.rs - main.rs: merged upstream (gt, toml_filter, verify) and multi-platform (cmd, hook, stream, safety, gemini) modules - utils.rs: accepted English doc comments Recovery edits (safety integration restored after incorrect overwrite): - hook/mod.rs: restored config::rules::try_remap(), safety::check_raw(), safety::check() per-command, FORMAT_PRESERVING/TRANSPARENT_SINKS pub(crate), basename extraction, safety-dependent tests - discover/registry.rs: updated 3 wc tests for upstream IGNORED_PREFIXES All hook engine + safety + gemini features preserved. 1332 tests pass, 0 failures, 5 ignored.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
--#287: Clap strips--from parsed args, sortk cargo test -- --nocapturewas passingcargo test --nocapture(missing--), causing cargo to reject it. Addedrestore_double_dash()incargo_cmd.rsthat detects--fromstd::env::args()and re-inserts it at the correct position before forwarding to cargo. Works for all cargo subcommands (test, clippy, etc.)[rtk: parse failed, running raw]stderr message when falling back to raw command execution for unrecognized commands likemakeorruby. The passthrough now runs silently, matching the documented behavior.Fixes #286
Fixes #287
Test plan
test_restore_double_dash_with_separator—["--nocapture"]→["--", "--nocapture"]test_restore_double_dash_with_test_name—["my_test", "--nocapture"]→["my_test", "--", "--nocapture"]test_restore_double_dash_without_separator— no--in original, args unchangedtest_restore_double_dash_empty_args— empty args stay emptytest_restore_double_dash_clippy—["-D", "warnings"]→["--", "-D", "warnings"]rtk cargo test -- --nocapturenow runs successfullyrtk make --versionandrtk ruby --versionrun silently (no stderr noise)