mirror of
https://github.com/openai/codex.git
synced 2026-09-11 20:36:49 +00:00
- Migrate apply-patch verification and application internals to use the async `ExecutorFileSystem` abstraction from `exec-server`. - Convert apply-patch `cwd` handling to `AbsolutePathBuf` through the verifier/parser/handler boundary. Doesn't change how the tool itself works.
354 lines
11 KiB
Rust
354 lines
11 KiB
Rust
use dirs::home_dir;
|
|
use schemars::JsonSchema;
|
|
use serde::Deserialize;
|
|
use serde::Deserializer;
|
|
use serde::Serialize;
|
|
use serde::de::Error as SerdeError;
|
|
use std::cell::RefCell;
|
|
use std::path::Display;
|
|
use std::path::Path;
|
|
use std::path::PathBuf;
|
|
use ts_rs::TS;
|
|
|
|
mod absolutize;
|
|
|
|
/// A path that is guaranteed to be absolute and normalized (though it is not
|
|
/// guaranteed to be canonicalized or exist on the filesystem).
|
|
///
|
|
/// IMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set
|
|
/// using [AbsolutePathBufGuard::new]. If no base path is set, the
|
|
/// deserialization will fail unless the path being deserialized is already
|
|
/// absolute.
|
|
#[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, JsonSchema, TS)]
|
|
pub struct AbsolutePathBuf(PathBuf);
|
|
|
|
impl AbsolutePathBuf {
|
|
fn maybe_expand_home_directory(path: &Path) -> PathBuf {
|
|
if let Some(path_str) = path.to_str()
|
|
&& let Some(home) = home_dir()
|
|
&& let Some(rest) = path_str.strip_prefix('~')
|
|
{
|
|
if rest.is_empty() {
|
|
return home;
|
|
} else if let Some(rest) = rest.strip_prefix('/') {
|
|
return home.join(rest.trim_start_matches('/'));
|
|
} else if cfg!(windows)
|
|
&& let Some(rest) = rest.strip_prefix('\\')
|
|
{
|
|
return home.join(rest.trim_start_matches('\\'));
|
|
}
|
|
}
|
|
path.to_path_buf()
|
|
}
|
|
|
|
pub fn resolve_path_against_base<P: AsRef<Path>, B: AsRef<Path>>(
|
|
path: P,
|
|
base_path: B,
|
|
) -> Self {
|
|
let expanded = Self::maybe_expand_home_directory(path.as_ref());
|
|
Self(absolutize::absolutize_from(&expanded, base_path.as_ref()))
|
|
}
|
|
|
|
pub fn from_absolute_path<P: AsRef<Path>>(path: P) -> std::io::Result<Self> {
|
|
let expanded = Self::maybe_expand_home_directory(path.as_ref());
|
|
Ok(Self(absolutize::absolutize(&expanded)?))
|
|
}
|
|
|
|
pub fn current_dir() -> std::io::Result<Self> {
|
|
let current_dir = std::env::current_dir()?;
|
|
Ok(Self(absolutize::absolutize_from(
|
|
¤t_dir,
|
|
¤t_dir,
|
|
)))
|
|
}
|
|
|
|
/// Construct an absolute path from `path`, resolving relative paths against
|
|
/// the process current working directory.
|
|
pub fn relative_to_current_dir<P: AsRef<Path>>(path: P) -> std::io::Result<Self> {
|
|
Ok(Self::resolve_path_against_base(
|
|
path,
|
|
std::env::current_dir()?,
|
|
))
|
|
}
|
|
|
|
pub fn join<P: AsRef<Path>>(&self, path: P) -> Self {
|
|
Self::resolve_path_against_base(path, &self.0)
|
|
}
|
|
|
|
pub fn parent(&self) -> Option<Self> {
|
|
self.0.parent().map(|p| {
|
|
debug_assert!(
|
|
p.is_absolute(),
|
|
"parent of AbsolutePathBuf must be absolute"
|
|
);
|
|
Self(p.to_path_buf())
|
|
})
|
|
}
|
|
|
|
pub fn as_path(&self) -> &Path {
|
|
&self.0
|
|
}
|
|
|
|
pub fn into_path_buf(self) -> PathBuf {
|
|
self.0
|
|
}
|
|
|
|
pub fn to_path_buf(&self) -> PathBuf {
|
|
self.0.clone()
|
|
}
|
|
|
|
pub fn to_string_lossy(&self) -> std::borrow::Cow<'_, str> {
|
|
self.0.to_string_lossy()
|
|
}
|
|
|
|
pub fn display(&self) -> Display<'_> {
|
|
self.0.display()
|
|
}
|
|
}
|
|
|
|
impl AsRef<Path> for AbsolutePathBuf {
|
|
fn as_ref(&self) -> &Path {
|
|
&self.0
|
|
}
|
|
}
|
|
|
|
impl std::ops::Deref for AbsolutePathBuf {
|
|
type Target = Path;
|
|
|
|
fn deref(&self) -> &Self::Target {
|
|
&self.0
|
|
}
|
|
}
|
|
|
|
impl From<AbsolutePathBuf> for PathBuf {
|
|
fn from(path: AbsolutePathBuf) -> Self {
|
|
path.into_path_buf()
|
|
}
|
|
}
|
|
|
|
/// Helpers for constructing absolute paths in tests.
|
|
pub mod test_support {
|
|
use super::AbsolutePathBuf;
|
|
use std::path::Path;
|
|
use std::path::PathBuf;
|
|
|
|
/// Extension methods for converting paths into [`AbsolutePathBuf`] values in tests.
|
|
pub trait PathExt {
|
|
/// Converts an already absolute path into an [`AbsolutePathBuf`].
|
|
fn abs(&self) -> AbsolutePathBuf;
|
|
}
|
|
|
|
impl PathExt for Path {
|
|
#[expect(clippy::expect_used)]
|
|
fn abs(&self) -> AbsolutePathBuf {
|
|
AbsolutePathBuf::try_from(self).expect("path should already be absolute")
|
|
}
|
|
}
|
|
|
|
/// Extension methods for converting path buffers into [`AbsolutePathBuf`] values in tests.
|
|
pub trait PathBufExt {
|
|
/// Converts an already absolute path buffer into an [`AbsolutePathBuf`].
|
|
fn abs(&self) -> AbsolutePathBuf;
|
|
}
|
|
|
|
impl PathBufExt for PathBuf {
|
|
fn abs(&self) -> AbsolutePathBuf {
|
|
self.as_path().abs()
|
|
}
|
|
}
|
|
}
|
|
|
|
impl TryFrom<&Path> for AbsolutePathBuf {
|
|
type Error = std::io::Error;
|
|
|
|
fn try_from(value: &Path) -> Result<Self, Self::Error> {
|
|
Self::from_absolute_path(value)
|
|
}
|
|
}
|
|
|
|
impl TryFrom<PathBuf> for AbsolutePathBuf {
|
|
type Error = std::io::Error;
|
|
|
|
fn try_from(value: PathBuf) -> Result<Self, Self::Error> {
|
|
Self::from_absolute_path(value)
|
|
}
|
|
}
|
|
|
|
impl TryFrom<&str> for AbsolutePathBuf {
|
|
type Error = std::io::Error;
|
|
|
|
fn try_from(value: &str) -> Result<Self, Self::Error> {
|
|
Self::from_absolute_path(value)
|
|
}
|
|
}
|
|
|
|
impl TryFrom<String> for AbsolutePathBuf {
|
|
type Error = std::io::Error;
|
|
|
|
fn try_from(value: String) -> Result<Self, Self::Error> {
|
|
Self::from_absolute_path(value)
|
|
}
|
|
}
|
|
|
|
thread_local! {
|
|
static ABSOLUTE_PATH_BASE: RefCell<Option<PathBuf>> = const { RefCell::new(None) };
|
|
}
|
|
|
|
/// Ensure this guard is held while deserializing `AbsolutePathBuf` values to
|
|
/// provide a base path for resolving relative paths. Because this relies on
|
|
/// thread-local storage, the deserialization must be single-threaded and
|
|
/// occur on the same thread that created the guard.
|
|
pub struct AbsolutePathBufGuard;
|
|
|
|
impl AbsolutePathBufGuard {
|
|
pub fn new(base_path: &Path) -> Self {
|
|
ABSOLUTE_PATH_BASE.with(|cell| {
|
|
*cell.borrow_mut() = Some(base_path.to_path_buf());
|
|
});
|
|
Self
|
|
}
|
|
}
|
|
|
|
impl Drop for AbsolutePathBufGuard {
|
|
fn drop(&mut self) {
|
|
ABSOLUTE_PATH_BASE.with(|cell| {
|
|
*cell.borrow_mut() = None;
|
|
});
|
|
}
|
|
}
|
|
|
|
impl<'de> Deserialize<'de> for AbsolutePathBuf {
|
|
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
|
|
where
|
|
D: Deserializer<'de>,
|
|
{
|
|
let path = PathBuf::deserialize(deserializer)?;
|
|
ABSOLUTE_PATH_BASE.with(|cell| match cell.borrow().as_deref() {
|
|
Some(base) => Ok(Self::resolve_path_against_base(path, base)),
|
|
None if path.is_absolute() => {
|
|
Self::from_absolute_path(path).map_err(SerdeError::custom)
|
|
}
|
|
None => Err(SerdeError::custom(
|
|
"AbsolutePathBuf deserialized without a base path",
|
|
)),
|
|
})
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use pretty_assertions::assert_eq;
|
|
use tempfile::tempdir;
|
|
|
|
#[test]
|
|
fn create_with_absolute_path_ignores_base_path() {
|
|
let base_dir = tempdir().expect("base dir");
|
|
let absolute_dir = tempdir().expect("absolute dir");
|
|
let base_path = base_dir.path();
|
|
let absolute_path = absolute_dir.path().join("file.txt");
|
|
let abs_path_buf =
|
|
AbsolutePathBuf::resolve_path_against_base(absolute_path.clone(), base_path);
|
|
assert_eq!(abs_path_buf.as_path(), absolute_path.as_path());
|
|
}
|
|
|
|
#[test]
|
|
fn relative_path_is_resolved_against_base_path() {
|
|
let temp_dir = tempdir().expect("base dir");
|
|
let base_dir = temp_dir.path();
|
|
let abs_path_buf = AbsolutePathBuf::resolve_path_against_base("file.txt", base_dir);
|
|
assert_eq!(abs_path_buf.as_path(), base_dir.join("file.txt").as_path());
|
|
}
|
|
|
|
#[test]
|
|
fn relative_path_dots_are_normalized_against_base_path() {
|
|
let temp_dir = tempdir().expect("base dir");
|
|
let base_dir = temp_dir.path();
|
|
let abs_path_buf =
|
|
AbsolutePathBuf::resolve_path_against_base("./nested/../file.txt", base_dir);
|
|
assert_eq!(abs_path_buf.as_path(), base_dir.join("file.txt").as_path());
|
|
}
|
|
|
|
#[test]
|
|
fn relative_to_current_dir_resolves_relative_path() -> std::io::Result<()> {
|
|
let current_dir = std::env::current_dir()?;
|
|
let abs_path_buf = AbsolutePathBuf::relative_to_current_dir("file.txt")?;
|
|
assert_eq!(
|
|
abs_path_buf.as_path(),
|
|
current_dir.join("file.txt").as_path()
|
|
);
|
|
Ok(())
|
|
}
|
|
|
|
#[test]
|
|
fn guard_used_in_deserialization() {
|
|
let temp_dir = tempdir().expect("base dir");
|
|
let base_dir = temp_dir.path();
|
|
let relative_path = "subdir/file.txt";
|
|
let abs_path_buf = {
|
|
let _guard = AbsolutePathBufGuard::new(base_dir);
|
|
serde_json::from_str::<AbsolutePathBuf>(&format!(r#""{relative_path}""#))
|
|
.expect("failed to deserialize")
|
|
};
|
|
assert_eq!(
|
|
abs_path_buf.as_path(),
|
|
base_dir.join(relative_path).as_path()
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn home_directory_root_is_expanded_in_deserialization() {
|
|
let Some(home) = home_dir() else {
|
|
return;
|
|
};
|
|
let temp_dir = tempdir().expect("base dir");
|
|
let abs_path_buf = {
|
|
let _guard = AbsolutePathBufGuard::new(temp_dir.path());
|
|
serde_json::from_str::<AbsolutePathBuf>("\"~\"").expect("failed to deserialize")
|
|
};
|
|
assert_eq!(abs_path_buf.as_path(), home.as_path());
|
|
}
|
|
|
|
#[test]
|
|
fn home_directory_subpath_is_expanded_in_deserialization() {
|
|
let Some(home) = home_dir() else {
|
|
return;
|
|
};
|
|
let temp_dir = tempdir().expect("base dir");
|
|
let abs_path_buf = {
|
|
let _guard = AbsolutePathBufGuard::new(temp_dir.path());
|
|
serde_json::from_str::<AbsolutePathBuf>("\"~/code\"").expect("failed to deserialize")
|
|
};
|
|
assert_eq!(abs_path_buf.as_path(), home.join("code").as_path());
|
|
}
|
|
|
|
#[test]
|
|
fn home_directory_double_slash_is_expanded_in_deserialization() {
|
|
let Some(home) = home_dir() else {
|
|
return;
|
|
};
|
|
let temp_dir = tempdir().expect("base dir");
|
|
let abs_path_buf = {
|
|
let _guard = AbsolutePathBufGuard::new(temp_dir.path());
|
|
serde_json::from_str::<AbsolutePathBuf>("\"~//code\"").expect("failed to deserialize")
|
|
};
|
|
assert_eq!(abs_path_buf.as_path(), home.join("code").as_path());
|
|
}
|
|
|
|
#[cfg(target_os = "windows")]
|
|
#[test]
|
|
fn home_directory_backslash_subpath_is_expanded_in_deserialization() {
|
|
let Some(home) = home_dir() else {
|
|
return;
|
|
};
|
|
let temp_dir = tempdir().expect("base dir");
|
|
let abs_path_buf = {
|
|
let _guard = AbsolutePathBufGuard::new(temp_dir.path());
|
|
let input =
|
|
serde_json::to_string(r#"~\code"#).expect("string should serialize as JSON");
|
|
serde_json::from_str::<AbsolutePathBuf>(&input).expect("is valid abs path")
|
|
};
|
|
assert_eq!(abs_path_buf.as_path(), home.join("code").as_path());
|
|
}
|
|
}
|