From 72901ac18c5e9108d2706e0e49e26907cdc6ff3f Mon Sep 17 00:00:00 2001 From: Chris Hayduk Date: Thu, 28 May 2026 11:02:22 -0400 Subject: [PATCH] Fix bounded read argument comments --- .../app-server/src/request_processors/fs_processor.rs | 7 ++++++- codex-rs/exec-server/src/fs_helper.rs | 7 ++++++- codex-rs/exec-server/src/local_file_system.rs | 8 ++++++-- codex-rs/exec-server/src/server/file_system_handler.rs | 7 ++++++- codex-rs/exec-server/tests/file_system.rs | 4 ++-- 5 files changed, 26 insertions(+), 7 deletions(-) diff --git a/codex-rs/app-server/src/request_processors/fs_processor.rs b/codex-rs/app-server/src/request_processors/fs_processor.rs index aa93514506..f49d93301a 100644 --- a/codex-rs/app-server/src/request_processors/fs_processor.rs +++ b/codex-rs/app-server/src/request_processors/fs_processor.rs @@ -71,7 +71,12 @@ impl FsRequestProcessor { .await .map_err(map_fs_error)?, (Some(offset), Some(length)) => file_system - .read_file_range(¶ms.path, offset, length, /*sandbox*/ None) + .read_file_range( + ¶ms.path, + /*offset*/ offset, + /*length*/ length, + /*sandbox*/ None, + ) .await .map_err(map_fs_error)?, _ => { diff --git a/codex-rs/exec-server/src/fs_helper.rs b/codex-rs/exec-server/src/fs_helper.rs index 9d393f387d..9ebd4d1d8c 100644 --- a/codex-rs/exec-server/src/fs_helper.rs +++ b/codex-rs/exec-server/src/fs_helper.rs @@ -177,7 +177,12 @@ pub(crate) async fn run_direct_request( .await .map_err(map_fs_error)?, (Some(offset), Some(length)) => file_system - .read_file_range(¶ms.path, offset, length, /*sandbox*/ None) + .read_file_range( + ¶ms.path, + /*offset*/ offset, + /*length*/ length, + /*sandbox*/ None, + ) .await .map_err(map_fs_error)?, _ => { diff --git a/codex-rs/exec-server/src/local_file_system.rs b/codex-rs/exec-server/src/local_file_system.rs index 28eeee52ac..d8b7eb7b71 100644 --- a/codex-rs/exec-server/src/local_file_system.rs +++ b/codex-rs/exec-server/src/local_file_system.rs @@ -99,7 +99,9 @@ impl ExecutorFileSystem for LocalFileSystem { ) -> FileSystemResult> { let (file_system, sandbox) = self.file_system_for(sandbox)?; file_system - .read_file_range(path, offset, length, sandbox) + .read_file_range( + path, /*offset*/ offset, /*length*/ length, sandbox, + ) .await } @@ -185,7 +187,9 @@ impl ExecutorFileSystem for UnsandboxedFileSystem { ) -> FileSystemResult> { reject_platform_sandbox_context(sandbox)?; self.file_system - .read_file_range(path, offset, length, /*sandbox*/ None) + .read_file_range( + path, /*offset*/ offset, /*length*/ length, /*sandbox*/ None, + ) .await } diff --git a/codex-rs/exec-server/src/server/file_system_handler.rs b/codex-rs/exec-server/src/server/file_system_handler.rs index 0ec046263a..d13031bc27 100644 --- a/codex-rs/exec-server/src/server/file_system_handler.rs +++ b/codex-rs/exec-server/src/server/file_system_handler.rs @@ -54,7 +54,12 @@ impl FileSystemHandler { .map_err(map_fs_error)?, (Some(offset), Some(length)) => self .file_system - .read_file_range(¶ms.path, offset, length, params.sandbox.as_ref()) + .read_file_range( + ¶ms.path, + /*offset*/ offset, + /*length*/ length, + params.sandbox.as_ref(), + ) .await .map_err(map_fs_error)?, _ => { diff --git a/codex-rs/exec-server/tests/file_system.rs b/codex-rs/exec-server/tests/file_system.rs index e0fa35d9f1..c6cd5f6e31 100644 --- a/codex-rs/exec-server/tests/file_system.rs +++ b/codex-rs/exec-server/tests/file_system.rs @@ -373,8 +373,8 @@ async fn file_system_methods_cover_surface_area(use_remote: bool) -> Result<()> let nested_file_range = file_system .read_file_range( &absolute_path(nested_file.clone()), - 6, - 4, + /*offset*/ 6, + /*length*/ 4, /*sandbox*/ None, ) .await