fix(doctor): improve shell path resolution#742
Merged
Merged
Conversation
use shell path-only lookup commands instead of plain which and validate resolved candidates as absolute executable files. apply the same executable validation to shared cli resolvers so function or alias output cannot be treated as a binary path.
flatten login shell resolution branches and avoid an intermediate allocation when building lookup commands. preserve executable path validation while making output summarization safe for non-ascii command output.
Collaborator
|
@codex please review |
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 5eaf5c7905
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
scan login shell lookup stdout for absolute executable paths so startup messages do not hide tools installed through the user's shell path. keep relative output and shell function bodies ignored.
rc files run before -c and can emit absolute paths before the lookup builtin's answer, so iterating from the top can shadow the real result with startup output. take the last executable absolute path instead. Signed-off-by: Matt Toohey <contact@matttoohey.com>
add a regression test in each resolver crate that exercises the rc-file echo case: two executables on disk, both as absolute paths in stdout, decoy first. the picker should return the second one. Signed-off-by: Matt Toohey <contact@matttoohey.com>
matt2e
approved these changes
May 28, 2026
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.
Summary
whichwith path-only shell lookup:whence -pfor zsh andtype -Pfor bash.acp-clientandblox-clicommand discovery.i have git mapped to a function that does some cleanup, but a minimal repro:
Testing
cargo fmt -p doctor -p acp-client -p blox-clicargo test -p doctor -p acp-client -p blox-cli