From f03bc23e8957f0b1605484b3da7fc8c1839f62a9 Mon Sep 17 00:00:00 2001 From: Jeremy Rose Date: Tue, 9 Jun 2026 19:56:23 -0700 Subject: [PATCH] Fix exact-boundary file EOF --- codex-rs/app-server/tests/suite/v2/fs.rs | 25 +++++++++++++++++++ .../exec-server/src/file_handle_manager.rs | 24 +++++++++++++++--- .../src/server/file_system_handler.rs | 2 +- 3 files changed, 46 insertions(+), 5 deletions(-) diff --git a/codex-rs/app-server/tests/suite/v2/fs.rs b/codex-rs/app-server/tests/suite/v2/fs.rs index 51664de5f9..e65c84ce6f 100644 --- a/codex-rs/app-server/tests/suite/v2/fs.rs +++ b/codex-rs/app-server/tests/suite/v2/fs.rs @@ -476,6 +476,31 @@ async fn fs_streaming_read_supports_stat_and_positional_reads() -> Result<()> { } ); + let final_read_id = mcp + .send_raw_request( + "fs/readFile/read", + Some(json!({ + "handleId": "read-1", + "offset": 6, + "maxBytes": 4, + })), + ) + .await?; + let final_read: FsReadFileReadResponse = to_response( + timeout( + DEFAULT_READ_TIMEOUT, + mcp.read_stream_until_response_message(RequestId::Integer(final_read_id)), + ) + .await??, + )?; + assert_eq!( + final_read, + FsReadFileReadResponse { + data_base64: STANDARD.encode("6789"), + eof: true, + } + ); + Ok(()) } diff --git a/codex-rs/exec-server/src/file_handle_manager.rs b/codex-rs/exec-server/src/file_handle_manager.rs index 27400e31f0..807687ffa4 100644 --- a/codex-rs/exec-server/src/file_handle_manager.rs +++ b/codex-rs/exec-server/src/file_handle_manager.rs @@ -96,10 +96,26 @@ impl FileHandleManager { result = entry.handle.read(offset, max_bytes) => result, }; match result { - Ok(data) => Ok(FileReadChunk { - eof: data.len() < max_bytes, - data, - }), + Ok(data) => { + let eof = if data.len() < max_bytes { + true + } else { + let metadata = tokio::select! { + _ = entry.cancellation.cancelled() => Err(cancelled_handle_error()), + result = entry.handle.metadata() => result, + }; + match metadata { + Ok(metadata) => { + offset.saturating_add(data.len() as u64) >= metadata.size_bytes + } + Err(err) => { + self.remove_if_read(handle_id, &entry).await; + return Err(err); + } + } + }; + Ok(FileReadChunk { data, eof }) + } Err(err) => { self.remove_if_read(handle_id, &entry).await; Err(err) 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 41b4ce58fd..11a9feff26 100644 --- a/codex-rs/exec-server/src/server/file_system_handler.rs +++ b/codex-rs/exec-server/src/server/file_system_handler.rs @@ -503,7 +503,7 @@ mod tests { .await .expect("read chunk"); assert_eq!(read.data_base64, STANDARD.encode("ew")); - assert!(!read.eof); + assert!(read.eof); handler .read_file_close(FsReadFileCloseParams { handle_id: "read-1".to_string(),