path-uri: clarify host-native path conversion (#29501)

## Why

Downstream refactors are producing confusing code with this
functionality having a very generic name. Encoding the specific
conversion approach in the method name makes it clearer.

## What

Rename `PathUri::from_path` to `PathUri::from_host_native_path` and
update its Rust call sites.
This commit is contained in:
Adam Perry @ OpenAI
2026-06-22 17:02:33 -07:00
committed by GitHub
Unverified
parent c53b1dae09
commit 11fab432be
31 changed files with 250 additions and 198 deletions
+8 -4
View File
@@ -1151,8 +1151,10 @@ mod tests {
.start(crate::ExecParams {
process_id: ProcessId::from("default-env-proc"),
argv: vec!["true".to_string()],
cwd: PathUri::from_path(std::env::current_dir().expect("read current dir"))
.expect("cwd URI"),
cwd: PathUri::from_host_native_path(
std::env::current_dir().expect("read current dir"),
)
.expect("cwd URI"),
env_policy: None,
env: Default::default(),
tty: false,
@@ -1188,8 +1190,10 @@ mod tests {
.start(crate::ExecParams {
process_id: ProcessId::from("local-sandbox-proc"),
argv: vec!["true".to_string()],
cwd: PathUri::from_path(std::env::current_dir().expect("read current dir"))
.expect("cwd URI"),
cwd: PathUri::from_host_native_path(
std::env::current_dir().expect("read current dir"),
)
.expect("cwd URI"),
env_policy: None,
env: Default::default(),
tty: false,
+3 -2
View File
@@ -314,8 +314,9 @@ mod tests {
#[test]
fn helper_protocol_uses_path_uris() -> serde_json::Result<()> {
let local_path = PathUri::from_path(std::env::current_dir().expect("cwd").join("file"))
.expect("path URI");
let local_path =
PathUri::from_host_native_path(std::env::current_dir().expect("cwd").join("file"))
.expect("path URI");
let paths = [
local_path,
PathUri::parse("file://server/share/file").expect("path URI"),
+2 -1
View File
@@ -956,7 +956,8 @@ mod tests {
ExecParams {
process_id: ProcessId::from("env-test"),
argv: vec!["true".to_string()],
cwd: PathUri::from_path(std::env::current_dir().expect("cwd")).expect("cwd URI"),
cwd: PathUri::from_host_native_path(std::env::current_dir().expect("cwd"))
.expect("cwd URI"),
env_policy: None,
env,
tty: false,
+2 -2
View File
@@ -519,7 +519,7 @@ mod tests {
let legacy_cwd = std::env::current_dir().expect("current directory");
let native_sandbox = FileSystemSandboxContext::from_permission_profile_with_cwd(
PermissionProfile::default(),
PathUri::from_path(&legacy_cwd).expect("cwd URI"),
PathUri::from_host_native_path(&legacy_cwd).expect("cwd URI"),
);
let mut legacy_sandbox =
serde_json::to_value(&native_sandbox).expect("sandbox should serialize");
@@ -531,7 +531,7 @@ mod tests {
.expect("legacy absolute path should deserialize");
let expected_sandbox = native_sandbox;
let expected = FsReadFileParams {
path: PathUri::from_path(legacy_path).expect("path URI"),
path: PathUri::from_host_native_path(legacy_path).expect("path URI"),
sandbox: Some(expected_sandbox.clone()),
};
@@ -274,7 +274,7 @@ mod tests {
)
.expect("runtime paths");
let handler = FileSystemHandler::new(runtime_paths);
let sandbox_cwd = PathUri::from_path(temp_dir.path()).expect("tempdir URI");
let sandbox_cwd = PathUri::from_host_native_path(temp_dir.path()).expect("tempdir URI");
let sandbox_context = |sandbox_policy| {
FileSystemSandboxContext::from_legacy_sandbox_policy(
sandbox_policy,
@@ -292,7 +292,8 @@ mod tests {
},
),
] {
let path = PathUri::from_path(temp_dir.path().join(file_name)).expect("path URI");
let path =
PathUri::from_host_native_path(temp_dir.path().join(file_name)).expect("path URI");
handler
.write_file(FsWriteFileParams {
@@ -312,7 +313,7 @@ mod tests {
.expect("canonicalize file");
assert_eq!(
canonicalized.path,
PathUri::from_path(
PathUri::from_host_native_path(
std::fs::canonicalize(temp_dir.path().join(file_name)).expect("canonical path"),
)
.expect("canonical path URI"),
@@ -27,7 +27,8 @@ fn exec_params_with_argv(process_id: &str, argv: Vec<String>) -> ExecParams {
ExecParams {
process_id: ProcessId::from(process_id),
argv,
cwd: PathUri::from_path(std::env::current_dir().expect("cwd")).expect("cwd URI"),
cwd: PathUri::from_host_native_path(std::env::current_dir().expect("cwd"))
.expect("cwd URI"),
env_policy: None,
env: inherited_path_env(),
tty: false,
+2 -1
View File
@@ -432,7 +432,8 @@ mod tests {
ExecParams {
process_id,
argv: sleep_then_print_argv(),
cwd: PathUri::from_path(std::env::current_dir().expect("cwd")).expect("cwd URI"),
cwd: PathUri::from_host_native_path(std::env::current_dir().expect("cwd"))
.expect("cwd URI"),
env_policy: None,
env,
tty: false,