Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions codex-rs/core-plugins/src/provider_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ impl ExecutorFileSystem for SyntheticPluginFileSystem {
is_directory,
is_file,
is_symlink: false,
size: 0,
created_at_ms: 0,
modified_at_ms: 0,
})
Expand Down
1 change: 1 addition & 0 deletions codex-rs/exec-server/src/fs_helper.rs
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@ pub(crate) async fn run_direct_request(
is_directory: metadata.is_directory,
is_file: metadata.is_file,
is_symlink: metadata.is_symlink,
size: metadata.size,
created_at_ms: metadata.created_at_ms,
modified_at_ms: metadata.modified_at_ms,
}))
Expand Down
1 change: 1 addition & 0 deletions codex-rs/exec-server/src/local_file_system.rs
Original file line number Diff line number Diff line change
Expand Up @@ -483,6 +483,7 @@ impl DirectFileSystem {
is_directory: metadata.is_dir(),
is_file: metadata.is_file(),
is_symlink: symlink_metadata.file_type().is_symlink(),
size: metadata.len(),
created_at_ms: metadata.created().ok().map_or(0, system_time_to_unix_ms),
modified_at_ms: metadata.modified().ok().map_or(0, system_time_to_unix_ms),
})
Expand Down
1 change: 1 addition & 0 deletions codex-rs/exec-server/src/protocol.rs
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@ pub struct FsGetMetadataResponse {
pub is_directory: bool,
pub is_file: bool,
pub is_symlink: bool,
pub size: u64,

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

P1 Badge Keep fs/getMetadata responses backward-compatible

With mixed-version remotes, older exec-server fs/getMetadata replies omit size; making it required makes serde fail before RemoteFileSystem::get_metadata returns metadata. Please default/optionalize this wire field or negotiate protocol while filling it when available. guidance

Useful? React with 👍 / 👎.

pub created_at_ms: i64,
pub modified_at_ms: i64,
}
Expand Down
1 change: 1 addition & 0 deletions codex-rs/exec-server/src/remote_file_system.rs
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ impl RemoteFileSystem {
is_directory: response.is_directory,
is_file: response.is_file,
is_symlink: response.is_symlink,
size: response.size,
created_at_ms: response.created_at_ms,
modified_at_ms: response.modified_at_ms,
})
Expand Down
1 change: 1 addition & 0 deletions codex-rs/exec-server/src/sandboxed_file_system.rs
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ impl SandboxedFileSystem {
is_directory: response.is_directory,
is_file: response.is_file,
is_symlink: response.is_symlink,
size: response.size,
created_at_ms: response.created_at_ms,
modified_at_ms: response.modified_at_ms,
})
Expand Down
1 change: 1 addition & 0 deletions codex-rs/exec-server/src/server/file_system_handler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ impl FileSystemHandler {
is_directory: metadata.is_directory,
is_file: metadata.is_file,
is_symlink: metadata.is_symlink,
size: metadata.size,
created_at_ms: metadata.created_at_ms,
modified_at_ms: metadata.modified_at_ms,
})
Expand Down
47 changes: 40 additions & 7 deletions codex-rs/exec-server/tests/file_system/shared.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ use anyhow::Context;
use anyhow::Result;
use codex_exec_server::CopyOptions;
use codex_exec_server::CreateDirectoryOptions;
use codex_exec_server::FileMetadata;
use codex_exec_server::ReadDirectoryEntry;
use codex_exec_server::RemoveOptions;
use codex_protocol::models::AdditionalPermissionProfile;
Expand Down Expand Up @@ -65,18 +66,34 @@ async fn file_system_get_metadata_reports_files_and_directories(
.get_metadata(&PathUri::from_path(&file_path)?, /*sandbox*/ None)
.await
.with_context(|| format!("mode={implementation}"))?;
assert_eq!(file_metadata.is_directory, false);
assert_eq!(file_metadata.is_file, true);
assert_eq!(file_metadata.is_symlink, false);
assert_eq!(
file_metadata,
FileMetadata {
is_directory: false,
is_file: true,
is_symlink: false,
size: 5,
created_at_ms: file_metadata.created_at_ms,
modified_at_ms: file_metadata.modified_at_ms,
}
);
assert!(file_metadata.modified_at_ms > 0);

let directory_metadata = file_system
.get_metadata(&PathUri::from_path(&directory_path)?, /*sandbox*/ None)
.await
.with_context(|| format!("mode={implementation}"))?;
assert_eq!(directory_metadata.is_directory, true);
assert_eq!(directory_metadata.is_file, false);
assert_eq!(directory_metadata.is_symlink, false);
assert_eq!(
directory_metadata,
FileMetadata {
is_directory: true,
is_file: false,
is_symlink: false,
size: std::fs::metadata(&directory_path)?.len(),
created_at_ms: directory_metadata.created_at_ms,
modified_at_ms: directory_metadata.modified_at_ms,
}
);
assert!(directory_metadata.modified_at_ms > 0);

Ok(())
Expand Down Expand Up @@ -395,7 +412,7 @@ async fn file_system_copy_rejects_directory_without_recursive(
#[test_case(FileSystemImplementation::Local ; "local")]
#[test_case(FileSystemImplementation::Remote ; "remote")]
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
async fn file_system_sandboxed_read_allows_readable_root(
async fn file_system_sandboxed_metadata_and_read_allow_readable_root(
implementation: FileSystemImplementation,
) -> Result<()> {
let context = create_file_system_context(implementation).await?;
Expand All @@ -408,6 +425,22 @@ async fn file_system_sandboxed_read_allows_readable_root(
std::fs::write(&file_path, "sandboxed hello")?;
let sandbox = read_only_sandbox(allowed_dir);

let metadata = file_system
.get_metadata(&PathUri::from_path(&file_path)?, Some(&sandbox))
.await
.with_context(|| format!("mode={implementation}"))?;
assert_eq!(
metadata,
FileMetadata {
is_directory: false,
is_file: true,
is_symlink: false,
size: 15,
created_at_ms: metadata.created_at_ms,
modified_at_ms: metadata.modified_at_ms,
}
);

let contents = file_system
.read_file(&PathUri::from_path(&file_path)?, Some(&sandbox))
.await
Expand Down
29 changes: 23 additions & 6 deletions codex-rs/exec-server/tests/file_system_unix.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ use codex_exec_server::CopyOptions;
use codex_exec_server::CreateDirectoryOptions;
#[cfg(target_os = "linux")]
use codex_exec_server::Environment;
use codex_exec_server::FileMetadata;
use codex_exec_server::RemoveOptions;
use codex_utils_path_uri::PathUri;
use pretty_assertions::assert_eq;
Expand Down Expand Up @@ -222,9 +223,17 @@ async fn file_system_get_metadata_reports_symlink_targets(
.get_metadata(&PathUri::from_path(&symlink_path)?, /*sandbox*/ None)
.await
.with_context(|| format!("mode={implementation}"))?;
assert_eq!(symlink_metadata.is_directory, false);
assert_eq!(symlink_metadata.is_file, true);
assert_eq!(symlink_metadata.is_symlink, true);
assert_eq!(
symlink_metadata,
FileMetadata {
is_directory: false,
is_file: true,
is_symlink: true,
size: 5,
created_at_ms: symlink_metadata.created_at_ms,
modified_at_ms: symlink_metadata.modified_at_ms,
}
);
assert!(symlink_metadata.modified_at_ms > 0);

let dir_path = tmp.path().join("notes");
Expand All @@ -238,9 +247,17 @@ async fn file_system_get_metadata_reports_symlink_targets(
)
.await
.with_context(|| format!("mode={implementation}"))?;
assert_eq!(dir_symlink_metadata.is_directory, true);
assert_eq!(dir_symlink_metadata.is_file, false);
assert_eq!(dir_symlink_metadata.is_symlink, true);
assert_eq!(
dir_symlink_metadata,
FileMetadata {
is_directory: true,
is_file: false,
is_symlink: true,
size: std::fs::metadata(&dir_path)?.len(),
created_at_ms: dir_symlink_metadata.created_at_ms,
modified_at_ms: dir_symlink_metadata.modified_at_ms,
}
);

Ok(())
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ impl SyntheticFileSystem {
is_directory,
is_file,
is_symlink: false,
size: 0,
created_at_ms: 0,
modified_at_ms: 0,
})
Expand Down
2 changes: 2 additions & 0 deletions codex-rs/file-system/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ pub struct FileMetadata {
pub is_directory: bool,
pub is_file: bool,
pub is_symlink: bool,
/// Size in bytes.
pub size: u64,
pub created_at_ms: i64,
pub modified_at_ms: i64,
}
Expand Down
Loading