From 13c152aa468bbfaafac19213884e1e00f609c1b4 Mon Sep 17 00:00:00 2001
From: jif-oai <jif@openai.com>
Date: Sun, 21 Jun 2026 12:37:48 +0200
Subject: [PATCH] Use raw values for filesystem RPC batches

---
 codex-rs/exec-server/src/lib.rs                | 1 -
 codex-rs/exec-server/src/remote_file_system.rs | 5 ++---
 codex-rs/file-system/src/lib.rs                | 4 +---
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/codex-rs/exec-server/src/lib.rs b/codex-rs/exec-server/src/lib.rs
index e9d1f55dff..3b97299703 100644
--- a/codex-rs/exec-server/src/lib.rs
+++ b/codex-rs/exec-server/src/lib.rs
@@ -42,7 +42,6 @@ pub use codex_file_system::CopyOptions;
 pub use codex_file_system::CreateDirectoryOptions;
 pub use codex_file_system::ExecutorFileSystem;
 pub use codex_file_system::ExecutorFileSystemFuture;
-pub use codex_file_system::ExecutorRpcBatchResult;
 pub use codex_file_system::FILE_READ_CHUNK_SIZE;
 pub use codex_file_system::FileMetadata;
 pub use codex_file_system::FileSystemReadStream;
diff --git a/codex-rs/exec-server/src/remote_file_system.rs b/codex-rs/exec-server/src/remote_file_system.rs
index 03d2d03f2e..7782e2d372 100644
--- a/codex-rs/exec-server/src/remote_file_system.rs
+++ b/codex-rs/exec-server/src/remote_file_system.rs
@@ -9,7 +9,6 @@ use crate::CreateDirectoryOptions;
 use crate::ExecServerError;
 use crate::ExecutorFileSystem;
 use crate::ExecutorFileSystemFuture;
-use crate::ExecutorRpcBatchResult;
 use crate::FileMetadata;
 use crate::FileSystemReadStream;
 use crate::FileSystemResult;
@@ -228,7 +227,7 @@ impl RemoteFileSystem {
     async fn execute_rpc_batch(
         &self,
         calls: Vec<(String, serde_json::Value)>,
-    ) -> FileSystemResult<Vec<ExecutorRpcBatchResult>> {
+    ) -> FileSystemResult<Vec<FileSystemResult<serde_json::Value>>> {
         let client = self.client.get().await.map_err(map_remote_error)?;
         Ok(client
             .call_batch(calls)
@@ -329,7 +328,7 @@ impl ExecutorFileSystem for RemoteFileSystem {
     fn execute_rpc_batch<'a>(
         &'a self,
         calls: Vec<(String, serde_json::Value)>,
-    ) -> ExecutorFileSystemFuture<'a, Vec<ExecutorRpcBatchResult>> {
+    ) -> ExecutorFileSystemFuture<'a, Vec<FileSystemResult<serde_json::Value>>> {
         Box::pin(RemoteFileSystem::execute_rpc_batch(self, calls))
     }
 }
diff --git a/codex-rs/file-system/src/lib.rs b/codex-rs/file-system/src/lib.rs
index c16d107acc..03bae3fa0c 100644
--- a/codex-rs/file-system/src/lib.rs
+++ b/codex-rs/file-system/src/lib.rs
@@ -166,8 +166,6 @@ pub type FileSystemResult<T> = io::Result<T>;
 pub type ExecutorFileSystemFuture<'a, T> =
     Pin<Box<dyn Future<Output = FileSystemResult<T>> + Send + 'a>>;
 
-pub type ExecutorRpcBatchResult = FileSystemResult<serde_json::Value>;
-
 /// Stream of immutable chunks read from an [`ExecutorFileSystem`].
 pub struct FileSystemReadStream {
     inner: Pin<Box<dyn Stream<Item = FileSystemResult<Bytes>> + Send + 'static>>,
@@ -271,7 +269,7 @@ pub trait ExecutorFileSystem: Send + Sync {
     fn execute_rpc_batch<'a>(
         &'a self,
         _requests: Vec<(String, serde_json::Value)>,
-    ) -> ExecutorFileSystemFuture<'a, Vec<ExecutorRpcBatchResult>> {
+    ) -> ExecutorFileSystemFuture<'a, Vec<FileSystemResult<serde_json::Value>>> {
         Box::pin(async {
             Err(io::Error::new(
                 io::ErrorKind::Unsupported,