mirror of
https://github.com/openai/codex.git
synced 2026-11-20 22:40:37 +00:00
Fix exact-boundary file EOF
This commit is contained in:
@@ -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(())
|
||||
}
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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(),
|
||||
|
||||
Reference in New Issue
Block a user