feat: TOML Part 2 — user-global config, shadow warning, rtk init templates, 4 new built-in filters#351
Merged
pszymkowiak merged 11 commits intomasterfrom Mar 10, 2026
Merged
Conversation
This was referenced Mar 5, 2026
2093f33 to
9ad4540
Compare
ea206fb to
e0a75ee
Compare
This was referenced Mar 6, 2026
There was a problem hiding this comment.
Pull request overview
This PR extends the TOML filter DSL system by adding a user-global filters location, generating filter templates via rtk init, and refactoring built-in filters into a multi-file architecture concatenated at build time.
Changes:
- Add user-global filter lookup at the platform config dir (
dirs::config_dir()/rtk/filters.toml) between project-local and built-ins. - Introduce
build.rsconcatenation ofsrc/filters/*.tomlinto an embeddedBUILTIN_TOML, plus new unit tests guarding the built-in set. - Add
rtk inittemplates for project-local and user-global filters; add new built-in filter TOML files and contributor docs.
Reviewed changes
Copilot reviewed 33 out of 33 changed files in this pull request and generated 16 comments.
Show a summary per file
| File | Description |
|---|---|
| build.rs | Concatenates src/filters/*.toml into a single embedded TOML blob and validates at build time. |
| Cargo.toml | Adds toml as a build-dependency for build.rs. |
| src/toml_filter.rs | Loads user-global filters, switches built-ins to BUILTIN_TOML, and adds multi-file architecture tests + warnings. |
| src/init.rs | Generates project-local and user-global filters.toml templates during rtk init. |
| src/filters/README.md | Documents the per-filter TOML file format and contribution workflow. |
| src/filters/ansible-playbook.toml | Built-in filter definition + inline tests. |
| src/filters/docker-compose-ps.toml | Built-in filter definition + inline tests. |
| src/filters/docker-inspect.toml | Built-in filter definition + inline tests. |
| src/filters/du.toml | Built-in filter definition + inline tests. |
| src/filters/fail2ban-client.toml | Built-in filter definition + inline tests. |
| src/filters/gcloud.toml | Built-in filter definition + inline tests. |
| src/filters/helm.toml | Built-in filter definition + inline tests. |
| src/filters/iptables.toml | Built-in filter definition + inline tests. |
| src/filters/make.toml | Built-in filter definition + inline tests. |
| src/filters/mix-compile.toml | Built-in filter definition + inline tests. |
| src/filters/mix-format.toml | Built-in filter definition + inline tests. |
| src/filters/mvn-build.toml | Built-in filter definition + inline tests. |
| src/filters/pio-run.toml | Built-in filter definition + inline tests. |
| src/filters/pnpm-build.toml | Built-in filter definition + inline tests. |
| src/filters/pre-commit.toml | Built-in filter definition + inline tests. |
| src/filters/quarto-render.toml | Built-in filter definition + inline tests. |
| src/filters/shopify-theme.toml | Built-in filter definition + inline tests. |
| src/filters/sops.toml | Built-in filter definition + inline tests. |
| src/filters/terraform-plan.toml | Built-in filter definition + inline tests. |
| src/filters/tofu-fmt.toml | Built-in filter definition + inline tests. |
| src/filters/tofu-init.toml | Built-in filter definition + inline tests. |
| src/filters/tofu-plan.toml | Built-in filter definition + inline tests. |
| src/filters/tofu-validate.toml | Built-in filter definition + inline tests. |
| src/filters/trunk-build.toml | Built-in filter definition + inline tests. |
| src/builtin_filters.toml | Removes the previous monolithic built-in filters file. |
| docs/filter-workflow.md | Adds documentation for the build/runtime pipeline and lookup order. |
| CONTRIBUTING.md | Adds contributor guide for creating and testing built-in filters. |
| CHANGELOG.md | Updates unreleased TOML DSL feature notes (lookup chain, warnings, built-ins list). |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+293
to
+297
| // Shadow warning: if match_command matches a Rust-handled command, this filter | ||
| // will never activate (Clap routes before run_fallback). Warn the author. | ||
| for cmd in RUST_HANDLED_COMMANDS { | ||
| if match_regex.is_match(cmd) { | ||
| eprintln!( |
There was a problem hiding this comment.
This overlap check only tests the regex against the bare root command (e.g. "git"), so it won’t warn for common dead filters like match_command = "^git\\s+status" or "^docker\\s+compose" even though Clap will still route those commands to Rust modules. Consider broadening the check (e.g. test against "{cmd} x" / "{cmd} x y" or detect ^<cmd> prefixes) so authors get warned for subcommand-specific patterns too.
Comment on lines
+98
to
+102
| First match wins. A project filter with the same name as a built-in shadows the built-in and triggers a warning: | ||
|
|
||
| ``` | ||
| [rtk] warning: filter 'make' is shadowing a built-in filter | ||
| ``` |
There was a problem hiding this comment.
This section claims RTK emits a warning when a project filter shadows a built-in filter with the same name, but there doesn’t appear to be any implementation of that warning in the registry load/merge code (no string match for “shadowing” in src). Either implement the described warning (detect name collisions between project/user and built-in filters) or adjust the docs to reflect current behavior.
CONTRIBUTING.md
Outdated
|
|
||
| **Not a good fit:** | ||
| - Commands with unstructured or unpredictable output (filtering would silently drop useful content) | ||
| - Commands already handled by a dedicated Rust module (`git`, `cargo`, `gh`, `docker`, `kubectl`, etc.) — TOML filters run first but Rust modules have more control |
There was a problem hiding this comment.
This bullet says “TOML filters run first but Rust modules have more control”, but the fallback TOML engine only runs when Clap parsing fails; commands handled by dedicated Rust modules won’t reach run_fallback() at all. Consider rewording to avoid implying TOML filters can apply to git/docker/etc. when those are Clap-routed commands.
Suggested change
| - Commands already handled by a dedicated Rust module (`git`, `cargo`, `gh`, `docker`, `kubectl`, etc.) — TOML filters run first but Rust modules have more control | |
| - Commands already handled by a dedicated Rust module (`git`, `cargo`, `gh`, `docker`, `kubectl`, etc.) — these bypass the TOML fallback engine; add behavior in the Rust module instead of a TOML filter |
Comment on lines
+43
to
+47
| | `match_output` | array | Short-circuit rules (`{ pattern, message }`) | | ||
| | `truncate_lines_at` | int | Truncate lines longer than N characters | | ||
| | `max_lines` | int | Keep only the first N lines | | ||
| | `tail_lines` | int | Keep only the last N lines (applied after other filters) | | ||
| | `on_empty` | string | Fallback message when filtered output is empty | |
There was a problem hiding this comment.
head_lines is supported by the TOML schema/engine but is missing from this “Available filter fields” table. Adding it (and noting how it composes with tail_lines and max_lines) would keep the contributor docs accurate.
| * `rtk init` generates commented filter templates at both project and global level | ||
| * `rtk verify` command with `--require-all` for inline test validation | ||
| * 14 new built-in filters: `tofu-plan/init/validate/fmt` ([#240](https://github.com/rtk-ai/rtk/issues/240)), `du` ([#284](https://github.com/rtk-ai/rtk/issues/284)), `fail2ban-client` ([#281](https://github.com/rtk-ai/rtk/issues/281)), `iptables` ([#282](https://github.com/rtk-ai/rtk/issues/282)), `mix-format/compile` ([#310](https://github.com/rtk-ai/rtk/issues/310)), `shopify-theme` ([#280](https://github.com/rtk-ai/rtk/issues/280)), `pio-run` ([#231](https://github.com/rtk-ai/rtk/issues/231)), `mvn-build` ([#338](https://github.com/rtk-ai/rtk/issues/338)) | ||
| * 18 built-in filters: `tofu-plan/init/validate/fmt` ([#240](https://github.com/rtk-ai/rtk/issues/240)), `du` ([#284](https://github.com/rtk-ai/rtk/issues/284)), `fail2ban-client` ([#281](https://github.com/rtk-ai/rtk/issues/281)), `iptables` ([#282](https://github.com/rtk-ai/rtk/issues/282)), `mix-format/compile` ([#310](https://github.com/rtk-ai/rtk/issues/310)), `shopify-theme` ([#280](https://github.com/rtk-ai/rtk/issues/280)), `pio-run` ([#231](https://github.com/rtk-ai/rtk/issues/231)), `mvn-build` ([#338](https://github.com/rtk-ai/rtk/issues/338)), `pre-commit`, `helm`, `gcloud`, `ansible-playbook` |
There was a problem hiding this comment.
This bullet says “18 built-in filters” but the current built-in filter set is 24 files under src/filters/*.toml (and test_builtin_filter_count asserts 24). Please update the count and list to reflect the actual shipped filters (e.g., include make, terraform-plan, docker-inspect, docker-compose-ps, sops, pnpm-build, quarto-render, trunk-build, etc.).
Suggested change
| * 18 built-in filters: `tofu-plan/init/validate/fmt` ([#240](https://github.com/rtk-ai/rtk/issues/240)), `du` ([#284](https://github.com/rtk-ai/rtk/issues/284)), `fail2ban-client` ([#281](https://github.com/rtk-ai/rtk/issues/281)), `iptables` ([#282](https://github.com/rtk-ai/rtk/issues/282)), `mix-format/compile` ([#310](https://github.com/rtk-ai/rtk/issues/310)), `shopify-theme` ([#280](https://github.com/rtk-ai/rtk/issues/280)), `pio-run` ([#231](https://github.com/rtk-ai/rtk/issues/231)), `mvn-build` ([#338](https://github.com/rtk-ai/rtk/issues/338)), `pre-commit`, `helm`, `gcloud`, `ansible-playbook` | |
| * 24 built-in filters, including: `tofu-plan/init/validate/fmt` ([#240](https://github.com/rtk-ai/rtk/issues/240)), `du` ([#284](https://github.com/rtk-ai/rtk/issues/284)), `fail2ban-client` ([#281](https://github.com/rtk-ai/rtk/issues/281)), `iptables` ([#282](https://github.com/rtk-ai/rtk/issues/282)), `mix-format/compile` ([#310](https://github.com/rtk-ai/rtk/issues/310)), `shopify-theme` ([#280](https://github.com/rtk-ai/rtk/issues/280)), `pio-run` ([#231](https://github.com/rtk-ai/rtk/issues/231)), `mvn-build` ([#338](https://github.com/rtk-ai/rtk/issues/338)), `pre-commit`, `helm`, `gcloud`, `ansible-playbook`, `make`, `terraform-plan`, `docker-inspect`, `docker-compose-ps`, `sops`, `pnpm-build`, `quarto-render`, `trunk-build` |
| B["build.rs\n① ls src/filters/*.toml\n② sort alphabetically\n③ concat → schema_version = 1 + all files"] --> C | ||
| C{"TOML valid?\nDuplicate names?"} -->|"❌ panic! (build fails)"| D[["🛑 Error message\npoints to bad file"]] | ||
| C -->|"✅ ok"| E[["OUT_DIR/builtin_filters.toml\n(generated file)"]] | ||
| E --> F["rustc\ninclude_str!(concat!(env!(OUT_DIR),\n'/builtin_filters.toml'))"] |
There was a problem hiding this comment.
The Rust snippet in the diagram uses env!(OUT_DIR) but the actual macro is env!("OUT_DIR") (as in env!("OUT_DIR") / env!("OUT_DIR")). As written, the example won’t compile if someone copies it; please update the diagram to match the real code.
Suggested change
| E --> F["rustc\ninclude_str!(concat!(env!(OUT_DIR),\n'/builtin_filters.toml'))"] | |
| E --> F["rustc\ninclude_str!(concat!(env!(\"OUT_DIR\"),\n'/builtin_filters.toml'))"] |
Comment on lines
+186
to
+190
| // Priority 2: user-global ~/.config/rtk/filters.toml | ||
| if let Some(config_dir) = dirs::config_dir() { | ||
| let global_path = config_dir.join("rtk").join("filters.toml"); | ||
| if let Ok(content) = std::fs::read_to_string(&global_path) { | ||
| match Self::parse_and_compile(&content, "user-global") { |
There was a problem hiding this comment.
Global filters are only loaded when dirs::config_dir() returns Some; if it returns None, RTK silently skips user-global filters entirely. Since rtk init --global currently falls back to writing under .config/rtk/filters.toml, consider either using the same fallback path here or emitting a warning/error so users aren’t left with a global filters file that’s never read.
| X -->|"✅ pattern matched"| Y[["emit message\nstop pipeline"]] | ||
| X -->|"no match"| Z["strip/keep_lines"] | ||
| Z --> AA["truncate_lines_at"] | ||
| AA --> AB["tail_lines"] |
There was a problem hiding this comment.
The pipeline diagram here omits the head_lines stage, but the TOML schema and implementation support both head_lines and tail_lines (and tests cover head_lines). Please update the diagram to include head_lines (or rename the node to head_lines/tail_lines) so the docs match runtime behavior.
Suggested change
| AA --> AB["tail_lines"] | |
| AA --> AB["head_lines / tail_lines"] |
CONTRIBUTING.md
Outdated
|
|
||
| **Guard 1 — exact filter count:** | ||
| ``` | ||
| assertion failed: Expected exactly 29 built-in filters, got 30. |
There was a problem hiding this comment.
The example failure message here hard-codes “Expected exactly 29 built-in filters…”, but the current guard in src/toml_filter.rs expects 24. Updating this example to match the actual test output will prevent contributors from chasing the wrong number when adding/removing filters.
Suggested change
| assertion failed: Expected exactly 29 built-in filters, got 30. | |
| assertion failed: Expected exactly 24 built-in filters, got 25. |
Comment on lines
+137
to
+139
| ``` | ||
| strip_ansi → replace → match_output → strip/keep_lines → truncate_lines_at → tail_lines → max_lines → on_empty | ||
| ``` |
There was a problem hiding this comment.
The documented pipeline order omits the head_lines stage, but the implementation supports head_lines and applies it as part of the head/tail stage. Please update this sequence to include head_lines (or represent the stage as head_lines/tail_lines) so it matches the code.
Collaborator
Code Review — Local Testing ResultsTested PR branch locally. Build succeeds, 720 tests pass. Existing commands unaffected. Confirmed Issues1. Three dead filters — Clap routes before TOML (P2)
Verified: The shadow warning system doesn't catch these because it only checks bare command names ( Fix: remove these 3 filter files, or hook TOML lookup into the passthrough paths ( 2. Filter count inconsistency (P3)
These should all agree. After fixing issue #1 (removing 3 dead filters), the count should be 3.
let config_dir = dirs::config_dir().unwrap_or_else(|| PathBuf::from(".config"));On systems without Fix: let config_dir = dirs::config_dir()
.or_else(|| dirs::home_dir().map(|h| h.join(".config")))
.ok_or_else(|| anyhow!("Cannot determine config directory"))?;Note: "4 lost filters" is a false positiveThe initial review flagged What's Good
|
FlorianBruniaux
added a commit
that referenced
this pull request
Mar 8, 2026
docker-inspect, docker-compose-ps, and pnpm-build are handled by container.rs and pnpm_cmd.rs before run_fallback is reached — their TOML filters never fire. Remove the files to avoid false documentation. Update toml_filter.rs guards: expected list -3 names, count 24→21, concat test 25→22. Update CONTRIBUTING.md example count to match. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
FlorianBruniaux
added a commit
that referenced
this pull request
Mar 8, 2026
Collaborator
Local review — round 3 (deep testing)Fixed ✅
Remaining
No code bugs remaining on this PR. The 2 critical bugs (trailing newline, RTK_NO_TOML) are in PR #349. |
FlorianBruniaux
added a commit
that referenced
this pull request
Mar 9, 2026
docker-inspect, docker-compose-ps, and pnpm-build are handled by container.rs and pnpm_cmd.rs before run_fallback is reached — their TOML filters never fire. Remove the files to avoid false documentation. Update toml_filter.rs guards: expected list -3 names, count 24→21, concat test 25→22. Update CONTRIBUTING.md example count to match. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
a5ea208 to
16ee0ae
Compare
FlorianBruniaux
added a commit
that referenced
this pull request
Mar 9, 2026
FlorianBruniaux
added a commit
that referenced
this pull request
Mar 9, 2026
…base Rebase on feat/toml-dsl-pr2 (post-PR-#349 fixes) caused the refactor commit to re-add dead filters that PR #351 had already removed: cargo-run, docker-compose-ps, docker-inspect, git-checkout, git-merge, git-remote, pnpm-build. These 7 files are removed to maintain the expected 36 filter count. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Collaborator
Re-reviewLGTM ✅ — CHANGELOG nit: "3 dead filters removed" — which 3? |
709a4e6 to
c108c8f
Compare
FlorianBruniaux
added a commit
that referenced
this pull request
Mar 10, 2026
docker-inspect, docker-compose-ps, and pnpm-build are handled by container.rs and pnpm_cmd.rs before run_fallback is reached — their TOML filters never fire. Remove the files to avoid false documentation. Update toml_filter.rs guards: expected list -3 names, count 24→21, concat test 25→22. Update CONTRIBUTING.md example count to match. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
16ee0ae to
7a3050d
Compare
FlorianBruniaux
added a commit
that referenced
this pull request
Mar 10, 2026
FlorianBruniaux
added a commit
that referenced
this pull request
Mar 10, 2026
…base Rebase on feat/toml-dsl-pr2 (post-PR-#349 fixes) caused the refactor commit to re-add dead filters that PR #351 had already removed: cargo-run, docker-compose-ps, docker-inspect, git-checkout, git-merge, git-remote, pnpm-build. These 7 files are removed to maintain the expected 36 filter count. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
…tes, 4 new filters - toml_filter: add ~/.config/rtk/filters.toml (priority 2, between project and built-in) - toml_filter: shadow warning when match_command overlaps a Rust-handled command - init: rtk init generates .rtk/filters.toml template (local) and ~/.config/rtk/filters.toml (global) - builtin_filters: add pre-commit, helm, gcloud, ansible-playbook (46/46 inline tests) - README: add "Custom Filters" section with lookup table, primitives, examples, built-in list Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
…scover data (52/52 tests)
…ilters Resolves issues #279, #277, #276 as TOML-native filters (no Rust required). - docker-inspect: strip_ansi + truncate_lines_at=120 + max_lines=60 - sops: strip_ansi + strip_lines_matching blank lines + max_lines=40 - docker-compose-ps: strip_ansi + truncate_lines_at=120 + max_lines=40 6 inline tests added (2 per filter), all passing. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
…vidual files Replace the 848-line src/builtin_filters.toml monolith with individual files under src/filters/<name>.toml (1 filter + tests per file). Files are concatenated alphabetically by build.rs at compile time into OUT_DIR/builtin_filters.toml, then embedded via a BUILTIN_TOML constant in toml_filter.rs. The build step validates TOML syntax and detects duplicate filter names across files. Benefits: - Zero merge conflicts when multiple PRs add filters (different files) - Clear PR diffs: "+1 file of 30 lines" vs "+30 lines in 850-line file" - Easy onboarding: copy any .toml, rename, edit 3 fields — done - Build-time TOML validation catches syntax errors before tests run Changes: - build.rs (new): concat + validate src/filters/*.toml - Cargo.toml: add [build-dependencies] toml = "0.8" - src/filters/*.toml (28 files): split from monolith - src/filters/README.md (new): contributor guide - src/toml_filter.rs: BUILTIN_TOML const + 5 include_str replacements - src/builtin_filters.toml: deleted Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
…t filter Unit tests added (toml_filter.rs): - test_builtin_toml_has_schema_version: ensures build.rs injects schema_version - test_builtin_all_expected_filters_present: guards against accidental file deletion - test_builtin_filter_count: exact count check (fails if filter added/removed without update) - test_builtin_all_filters_have_inline_tests: prevents shipping filters with no tests - test_new_filter_discoverable_after_concat: simulates build.rs concat, verifies lookup New built-in filter: - src/filters/wget.toml: compact wget download output (strips connection/resolution noise, short-circuits on 'saved [' to 'ok (downloaded)', 2 inline tests) Test results: 661/661 unit tests, 60/60 inline TOML filter tests Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Build pipeline + runtime lookup priority, both as Mermaid flowcharts. Shows the full path from src/filters/*.toml to binary to execution. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
…mote, cargo-run These filters were never reachable: Clap routes rtk git/cargo commands to their dedicated Rust modules before run_fallback is called. The TOML engine only fires for unknown commands. Shipping dead filters gives false confidence (inline tests pass, but filters never activate in production). Also fixes P1-1 from the PR #386 review: wget was in RUST_HANDLED_COMMANDS and the shadow warning fired at compile time but did not block the build. Removed: cargo-run.toml, git-checkout.toml, git-merge.toml, git-remote.toml, wget.toml Updated test guards: count 29→24, expected list -5 names, concat test 30→25. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
docker-inspect, docker-compose-ps, and pnpm-build are handled by container.rs and pnpm_cmd.rs before run_fallback is reached — their TOML filters never fire. Remove the files to avoid false documentation. Update toml_filter.rs guards: expected list -3 names, count 24→21, concat test 25→22. Update CONTRIBUTING.md example count to match. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
… clippy, docs macOS path - Add (\\s|$) word-boundary anchors to 6 tofu/mix match_command regexes (tofu-plan, tofu-init, tofu-validate, tofu-fmt, mix-format, mix-compile) - Add on_empty = "make: ok" to make.toml + update existing empty-output test - Fix build.rs clippy: map_or(false, ...) → is_some_and(..) - Add macOS alt path note to filter-workflow.md Mermaid diagram Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
7a3050d to
a4f1c88
Compare
pszymkowiak
pushed a commit
that referenced
this pull request
Mar 10, 2026
pszymkowiak
pushed a commit
that referenced
this pull request
Mar 10, 2026
…base Rebase on feat/toml-dsl-pr2 (post-PR-#349 fixes) caused the refactor commit to re-add dead filters that PR #351 had already removed: cargo-run, docker-compose-ps, docker-inspect, git-checkout, git-merge, git-remote, pnpm-build. These 7 files are removed to maintain the expected 36 filter count. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
pszymkowiak
pushed a commit
that referenced
this pull request
Mar 10, 2026
…et, swift, shellcheck, hadolint, poetry, composer, brew, df, ps, systemctl, yamllint, markdownlint, uv) (#386) * docs: bump version refs to 0.27.1, fix module count to 59 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * refactor(filters): split monolithic builtin_filters.toml into 28 individual files Replace the 848-line src/builtin_filters.toml monolith with individual files under src/filters/<name>.toml (1 filter + tests per file). Files are concatenated alphabetically by build.rs at compile time into OUT_DIR/builtin_filters.toml, then embedded via a BUILTIN_TOML constant in toml_filter.rs. The build step validates TOML syntax and detects duplicate filter names across files. Benefits: - Zero merge conflicts when multiple PRs add filters (different files) - Clear PR diffs: "+1 file of 30 lines" vs "+30 lines in 850-line file" - Easy onboarding: copy any .toml, rename, edit 3 fields — done - Build-time TOML validation catches syntax errors before tests run Changes: - build.rs (new): concat + validate src/filters/*.toml - Cargo.toml: add [build-dependencies] toml = "0.8" - src/filters/*.toml (28 files): split from monolith - src/filters/README.md (new): contributor guide - src/toml_filter.rs: BUILTIN_TOML const + 5 include_str replacements - src/builtin_filters.toml: deleted Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * feat(filters): add 15 TOML filters (ping, rsync, dotnet, swift, shellcheck, hadolint, poetry, composer, brew, df, ps, systemctl, yamllint, markdownlint, uv) Tier 1 (high value): - ping: strip per-packet lines, tail_lines=4 keeps summary only (70%+) - rsync: match_output on "total size is" → "ok (synced)" (80%+) - dotnet-build: match_output on "Build succeeded" → "ok (build succeeded)" (70%+) - swift-build: match_output on "Build complete!" → "ok (build complete)" (70%+) - shellcheck: strip blank lines + caret indicator lines, max_lines=50 (60%+) - hadolint: strip blank lines, truncate_lines_at=120, max_lines=40 (60%+) - poetry-install: strip downloads, match_output on "No dependencies to install" (75%+) - composer-install: strip downloads, match_output on "Nothing to install" (75%+) - brew-install: strip Downloading/Pouring, match_output on "already installed" (70%+) Tier 2 (medium value): - df: truncate_lines_at=80, max_lines=20 (60%+) - ps-aux: truncate_lines_at=120, max_lines=30 (60%+) - systemctl-status: strip blank lines, max_lines=20 (65%+) - yamllint: strip blank lines, max_lines=50, truncate_lines_at=120 (60%+) - markdownlint: strip blank lines, max_lines=50, truncate_lines_at=120 (60%+) - uv-sync: strip downloads, match_output on "Audited"/"Resolved" (70%+) Updates test guards: count 29→44, expected list +15 names, concat test 30→45. All 90 inline TOML tests pass. 720 unit tests pass. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix(filters): address PR #386 code review (P1 + P2 items) P1-2: rsync.toml — remove dead strip rule "^total size is \d" match_output fires at stage 3, strip at stage 4 — the rule was unreachable on success and removed a useful line on error paths. P2-1: ps-aux.toml renamed to ps.toml, match_command ^ps\b → ^ps(\s|$) Prevents false matches on pstree, psql, pstack. Filter name and test sections updated from ps-aux to ps. Guard list updated. P2-2: df.toml match_command ^df\b → ^df(\s|$) Prevents false matches on dfs, dfx. P2-4: shellcheck.toml — keep caret indicator lines (^-- SC...) Stripping them lost the exact character position of the error. Only blank lines are now stripped. P2-7: swift-build.toml — remove dead strip rule "^Build complete!" match_output short-circuits before strip runs on success paths. The rule was unreachable and confusing. All 90 inline tests pass. 720 unit tests pass. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: address PR #386 code review — 4 filter fixes - uv-sync: remove Resolved short-circuit (fires before package list) - dotnet-build: short-circuit only on 0 warnings + 0 errors (not on any "Build succeeded" — catches builds with warnings too) - poetry-install: support Poetry 2.x bullet syntax (• vs -) and "No changes." message; add Poetry 2.x test - ping: add Windows format support (Pinging + Reply from patterns); add Windows test Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * docs(changelog): document round 2 fixes (PR #351 + #386) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: rebase on updated PR #351 — remove 7 dead filters re-added by rebase Rebase on feat/toml-dsl-pr2 (post-PR-#349 fixes) caused the refactor commit to re-add dead filters that PR #351 had already removed: cargo-run, docker-compose-ps, docker-inspect, git-checkout, git-merge, git-remote, pnpm-build. These 7 files are removed to maintain the expected 36 filter count. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * feat(dsl): add 'unless' to match_output — prevent short-circuit when errors present Fixes two match_output bugs where success short-circuit fires before strip_lines_matching can surface errors in the full output blob. Changes: - Add optional `unless` field to MatchOutputRule (serde default = None) - Compile `unless` into Option<Regex> in CompiledMatchOutputRule - In apply_filter stage 3: if `unless` matches the blob, skip the rule and continue to the next match_output rule (or fall through to the pipeline) - rsync.toml: add `unless = "error|failed|No such file"` to the "total size is" rule; add test verifying errors are not swallowed - swift-build.toml: add `unless = "warning:|error:"` to the "Build complete!" rule; add test verifying warnings are not swallowed - CONTRIBUTING.md: document match_output[].unless in the field reference table - Unit tests: 5 new tests covering unless blocks/allows/falls-through/ no-regression/invalid-regex Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * docs: fix README version string 0.27.1 → 0.27.2 after rebase Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * docs: fix version 0.27.1→0.27.2 and module count 59→60 in ARCHITECTURE.md + CLAUDE.md Version strings and module count were stale after rebase onto updated feat/toml-dsl-pr2. validate-docs.sh now passes clean. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
This was referenced Mar 10, 2026
Closed
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
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.
Context
Follow-up to #349 (TOML DSL PR 1). Builds directly on that branch — should merge after #349.
What this PR adds
1. User-global
~/.config/rtk/filters.tomlNew priority level in the lookup chain:
2. Shadow warning
When a project or user filter overrides a built-in filter with the same name, RTK now prints a one-line warning to stderr:
3.
rtk inittemplatesrtk init --localandrtk init --globalgenerate a commented TOML template with examples at the appropriate location.4. 21 built-in filters
PR 1 shipped 14 built-in filters. This PR ships 7 more:
pre-commit,helm,gcloud,ansible-playbook— DevOps stackquarto-render,trunk-build— fromrtk discovertop unhandleddocker-inspect,sops,docker-compose-ps— infra / secretstofu-plan,tofu-init,tofu-validate,tofu-fmt— OpenTofu (mirror of Terraform)make— compact build outputmix-format,mix-compile— Elixir stackmvn-build,pio-run,iptables,fail2ban-client,du,shopify-theme— extended ecosystem5. Refactor: monolithic → multi-file built-in filters
Before:
src/builtin_filters.toml— 848 lines, 28 filters, guaranteed merge conflicts.After:
src/filters/<name>.toml— 21 individual files, concatenated bybuild.rs.build.rsconcatenates files alphabetically, validates the combined TOML, and detects duplicate filter names at compile time. The result is embedded via:DX impact:
.toml, rename, edit 3 fields+30 lines in 850-line file+1 new file, 30 linescargo build6.
CONTRIBUTING.mdStep-by-step guide for adding a built-in filter, including filter field reference, pipeline order,
match_commandtips, and a pre-PR checklist. Auto-linked by GitHub in the PR creation flow.Test coverage
cargo test: all passing (5 new tests for the multi-file architecture)rtk verify: all inline TOML filter tests passedcargo clippy: 0 errorsNew unit tests in
toml_filter.rs:test_builtin_toml_has_schema_version— ensures build.rs injects the headertest_builtin_all_expected_filters_present— guard against accidental file deletiontest_builtin_filter_count— exact count, fails if a filter is added/removed silentlytest_builtin_all_filters_have_inline_tests— prevents shipping filters with no teststest_new_filter_discoverable_after_concat— simulates the full build.rs pipelineFiles changed
build.rssrc/filters/*.toml, detect duplicate namesCargo.toml[build-dependencies] toml = "0.8"src/filters/*.toml(21 files)src/filters/README.mdsrc/toml_filter.rsBUILTIN_TOMLconst + 5include_str!replacements + 5 new testssrc/builtin_filters.tomlCONTRIBUTING.md🤖 Generated with Claude Code