Skip to content

fix(windows-path): preserve PATH order; include core env vars #5579

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dylan-hurd-oai merged 16 commits into from
Oct 29, 2025
+20 −0
Merged

fix(windows-path): preserve PATH order; include core env vars #5579

Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
eaf1fdf
[fix][windows-path]: preserve PATH order; include core env vars
cpjet64 Oct 23, 2025
12ad730
[fix][windows-env]: add Path alias and common shell vars
cpjet64 Oct 23, 2025
2fcff53
[chore][lint]: avoid unused_mut on non-Windows; drop redundant clone
cpjet64 Oct 23, 2025
e2d234f
[fix][windows-path]: mirror Path <-> PATH consistently
cpjet64 Oct 23, 2025
f9787a3
Merge branch 'main' into feat/winpath-pathex
cpjet64 Oct 24, 2025
b5eba7c
Merge branch 'main' into feat/winpath-pathex
cpjet64 Oct 24, 2025
185cff5
Merge branch 'main' into feat/winpath-pathex
cpjet64 Oct 24, 2025
9266740
Merge branch 'main' into feat/winpath-pathex
cpjet64 Oct 24, 2025
5a2b5db
Merge branch 'main' into feat/winpath-pathex
cpjet64 Oct 26, 2025
e7a1f68
Merge branch 'main' into feat/winpath-pathex
cpjet64 Oct 28, 2025
28c5630
Merge branch 'main' into feat/winpath-pathex
cpjet64 Oct 28, 2025
ad54e6b
Merge branch 'main' into feat/winpath-pathex
cpjet64 Oct 28, 2025
655fdb7
Merge branch 'main' into feat/winpath-pathex
cpjet64 Oct 28, 2025
9a08f38
Merge branch 'main' into feat/winpath-pathex
cpjet64 Oct 29, 2025
7fd616e
[fix][windows-env]: scope PR 5579 to DEFAULT_ENV_VARS only\n\nContext…
cpjet64 Oct 29, 2025
a660432
Merge branch 'main' into feat/winpath-pathex
cpjet64 Oct 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions codex-rs/rmcp-client/src/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,13 +171,33 @@ pub(crate) const DEFAULT_ENV_VARS: &[&str] = &[

#[cfg(windows)]
pub(crate) const DEFAULT_ENV_VARS: &[&str] = &[
// Core path resolution
"PATH",
"PATHEXT",
// Shell and system roots
"COMSPEC",
"SYSTEMROOT",
"SYSTEMDRIVE",
// User context and profiles
"USERNAME",
"USERDOMAIN",
"USERPROFILE",
"HOMEDRIVE",
"HOMEPATH",
// Program locations
"PROGRAMFILES",
"PROGRAMFILES(X86)",
"PROGRAMW6432",
"PROGRAMDATA",
// App data and caches
"LOCALAPPDATA",
"APPDATA",
// Temp locations
"TEMP",
"TMP",
// Common shells/pwsh hints
"POWERSHELL",
"PWSH",
Copy link
Copy Markdown
Collaborator

@dylan-hurd-oai dylan-hurd-oai Oct 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cpjet64 if we separate these changes, i'm happy to stamp the DEFAULT_ENV_VARS change and merge it

Copy link
Copy Markdown
Contributor Author

@cpjet64 cpjet64 Oct 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dylan-hurd-oai Happy to do so but was hoping it would pass since my next PR for this issue is virtual shells like Python venv and such and the non-PATH fix is the foundation.

I will make this PR into a dedicated path fix in the meantime.

Thank you!

Copy link
Copy Markdown
Collaborator

@dylan-hurd-oai dylan-hurd-oai Oct 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not opposed to switching to appending here, but the impacts of the path change are just more subtle, and might impact the success rate of apply_patch calls. Adding env vars to unblock better MCP support on windows feels much lower risk, so let's get that improvement in and we can focus on this PATH change here.

Copy link
Copy Markdown
Contributor Author

@cpjet64 cpjet64 Oct 29, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dylan-hurd-oai Understood and I agree the env var change is definitely more low risk because I didn't consider the apply-patch impact in that manner. I'll split them now and get you a new commit in a few minutes! Later I'll dig more into apply_patch to make sure before I push a new PR for it. Thanks for that!

];

#[cfg(test)]
Expand Down
Loading