From b0b16a26931923f35582de52cc1daf7c454c1205 Mon Sep 17 00:00:00 2001 From: starr-openai Date: Thu, 19 Mar 2026 16:31:44 -0700 Subject: [PATCH] Align exec-server handler naming and fs defaults Restore the app-server fs default onto Environment::default(), bring back a sync local Environment default for that path, and rename the process RPC adapter to match the filesystem handler style. Co-authored-by: Codex --- codex-rs/app-server/src/fs_api.rs | 4 ++-- codex-rs/exec-server/src/environment.rs | 9 +++++++++ codex-rs/exec-server/src/server/filesystem.rs | 2 +- codex-rs/exec-server/src/server/handler.rs | 6 +++--- codex-rs/exec-server/src/server/process_handler.rs | 4 ++-- 5 files changed, 17 insertions(+), 8 deletions(-) diff --git a/codex-rs/app-server/src/fs_api.rs b/codex-rs/app-server/src/fs_api.rs index 3ce485aaa0..9baa2b1dce 100644 --- a/codex-rs/app-server/src/fs_api.rs +++ b/codex-rs/app-server/src/fs_api.rs @@ -20,8 +20,8 @@ use codex_app_server_protocol::FsWriteFileResponse; use codex_app_server_protocol::JSONRPCErrorError; use codex_exec_server::CopyOptions; use codex_exec_server::CreateDirectoryOptions; +use codex_exec_server::Environment; use codex_exec_server::ExecutorFileSystem; -use codex_exec_server::LocalFileSystem; use codex_exec_server::RemoveOptions; use std::io; use std::sync::Arc; @@ -34,7 +34,7 @@ pub(crate) struct FsApi { impl Default for FsApi { fn default() -> Self { Self { - file_system: Arc::new(LocalFileSystem), + file_system: Arc::new(Environment::default().get_filesystem()), } } } diff --git a/codex-rs/exec-server/src/environment.rs b/codex-rs/exec-server/src/environment.rs index f47ff327c3..a4a4a10483 100644 --- a/codex-rs/exec-server/src/environment.rs +++ b/codex-rs/exec-server/src/environment.rs @@ -19,6 +19,15 @@ pub struct Environment { executor: Arc, } +impl Default for Environment { + fn default() -> Self { + Self { + experimental_exec_server_url: None, + executor: Arc::new(LocalProcess::default()), + } + } +} + impl std::fmt::Debug for Environment { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { f.debug_struct("Environment") diff --git a/codex-rs/exec-server/src/server/filesystem.rs b/codex-rs/exec-server/src/server/filesystem.rs index bc3d22a4da..a263bb1fee 100644 --- a/codex-rs/exec-server/src/server/filesystem.rs +++ b/codex-rs/exec-server/src/server/filesystem.rs @@ -36,7 +36,7 @@ pub(crate) struct ExecServerFileSystem { impl Default for ExecServerFileSystem { fn default() -> Self { Self { - file_system: Arc::new(Environment.get_filesystem()), + file_system: Arc::new(Environment::default().get_filesystem()), } } } diff --git a/codex-rs/exec-server/src/server/handler.rs b/codex-rs/exec-server/src/server/handler.rs index b89ea0df27..d18784be1d 100644 --- a/codex-rs/exec-server/src/server/handler.rs +++ b/codex-rs/exec-server/src/server/handler.rs @@ -25,17 +25,17 @@ use crate::protocol::WriteParams; use crate::protocol::WriteResponse; use crate::rpc::RpcNotificationSender; use crate::server::filesystem::ExecServerFileSystem; -use crate::server::process_handler::ProcessHandler; +use crate::server::process_handler::ExecServerProcess; pub(crate) struct ExecServerHandler { - process: ProcessHandler, + process: ExecServerProcess, file_system: ExecServerFileSystem, } impl ExecServerHandler { pub(crate) fn new(notifications: RpcNotificationSender) -> Self { Self { - process: ProcessHandler::new(notifications), + process: ExecServerProcess::new(notifications), file_system: ExecServerFileSystem::default(), } } diff --git a/codex-rs/exec-server/src/server/process_handler.rs b/codex-rs/exec-server/src/server/process_handler.rs index 6f22890d35..abe28e17ee 100644 --- a/codex-rs/exec-server/src/server/process_handler.rs +++ b/codex-rs/exec-server/src/server/process_handler.rs @@ -13,11 +13,11 @@ use crate::protocol::WriteResponse; use crate::rpc::RpcNotificationSender; #[derive(Clone)] -pub(crate) struct ProcessHandler { +pub(crate) struct ExecServerProcess { process: LocalProcess, } -impl ProcessHandler { +impl ExecServerProcess { pub(crate) fn new(notifications: RpcNotificationSender) -> Self { Self { process: LocalProcess::new(notifications),