[chaliy]

Motivation

• Metadata-based --sort/--sortr modes were only applied to recursive candidate batches, so explicit file/argument paths and the --files explicit-path branch were not ordered by metadata as intended.
• The change ensures behavior matches ripgrep parity: metadata sorts should order all file candidates (recursive + explicit) consistently.

Description

• Collect explicit path arguments as RgFileCandidate entries (preserving metadata) instead of appending bare explicit inputs, so they can participate in a single global candidate sort.
• Add display_override and explicit fields to RgFileCandidate and centralize display logic via candidate_display_path(...) to preserve explicit-file display semantics.
• Apply sort_rg_candidates(...) over the aggregated candidate list (honoring --sort/--sortr and --sort none) before reading files, and update --files to render sorted candidate displays via the same helper.
• Add timed differential test cases for metadata sorting across explicit file arguments and for --files --sort modified with explicit files.
• All changes confined to crates/bashkit/src/builtins/rg/mod.rs and aim to be minimal while preserving existing explicit-file behavior (binary handling, display formatting).

Testing

• Ran cargo fmt --check and cargo fmt to normalize formatting; check passed.
• Ran cargo test -p bashkit builtins::rg::tests::diff_rg_matches_real_rg_cases and the suite passed.
• Ran cargo test -p bashkit builtins::rg::tests::real_rg_binary_is_available_for_differential_tests and it passed.
• Unit tests executed successfully for the modified code paths (no failures reported).

---

Codex Task

[Copilot]

Pull request overview

This PR fixes rg metadata-based sorting (--sort / --sortr) so it applies consistently across all file candidates, including explicit file arguments and the --files explicit-path branch, matching ripgrep’s behavior more closely.

Changes:

• Represent explicit file arguments as RgFileCandidate (with metadata) so they can be globally sorted together with recursively discovered files.
• Add display_override + explicit to RgFileCandidate and centralize display formatting in candidate_display_path(...) to preserve explicit-path display semantics.
• Add differential test cases covering metadata sorting across explicit file arguments and --files --sort modified with explicit files.

---

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

[cloudflare-workers-and-pages]

Deploying with    Cloudflare Workers

The latest updates on your project. Learn more about integrating Git with Workers.

Status	Name	Latest Commit	Preview URL	Updated (UTC)
✅ Deployment successful! View logs	bashkit	67638f3	Commit Preview URL	Jun 05 2026, 08:28 PM