mirror of
https://github.com/openai/codex.git
synced 2026-10-21 07:42:01 +00:00
## Why Selected capability roots can contribute plugins, MCP servers, connectors, and skills. Discovering each contribution separately requires repeated access to the executor filesystem. ## What changed - Add the `capabilityRoots/discoverV1` exec-server RPC to scan selected roots and materialize recognized plugin manifests, configuration files, skill instructions, and skill metadata in one bounded request. - Add the opt-in `executor_capability_discovery` feature, with a thread-scoped cache and per-step snapshot shared by MCP and skill discovery. - Parse MCP, connector, and skill contributions from the materialized snapshot, including serving cached skill instructions without another filesystem read. ## Testing - Cover discovery limits, manifest precedence, root-local failures, cache reuse, plugin contributions, and parity with the existing environment skill loader. GitOrigin-RevId: f98fd2321cafb58c596db02da1f83c09d8eb375d
368 lines
12 KiB
Rust
368 lines
12 KiB
Rust
use std::io;
|
|
|
|
use base64::Engine as _;
|
|
use base64::engine::general_purpose::STANDARD;
|
|
use codex_exec_server_protocol::JSONRPCErrorError;
|
|
|
|
use crate::CapabilityRootsDiscoverParams;
|
|
use crate::CapabilityRootsDiscoverResponse;
|
|
use crate::CopyOptions;
|
|
use crate::CreateDirectoryOptions;
|
|
use crate::ExecServerRuntimePaths;
|
|
use crate::ExecutorFileSystem;
|
|
use crate::RemoveOptions;
|
|
use crate::file_read::FileReadHandleManager;
|
|
use crate::local_file_system::LocalFileSystem;
|
|
use crate::protocol::FS_READ_DIRECTORY_METHOD;
|
|
use crate::protocol::FS_WRITE_FILE_METHOD;
|
|
use crate::protocol::FsCanonicalizeParams;
|
|
use crate::protocol::FsCanonicalizeResponse;
|
|
use crate::protocol::FsCloseParams;
|
|
use crate::protocol::FsCloseResponse;
|
|
use crate::protocol::FsCopyParams;
|
|
use crate::protocol::FsCopyResponse;
|
|
use crate::protocol::FsCreateDirectoryParams;
|
|
use crate::protocol::FsCreateDirectoryResponse;
|
|
use crate::protocol::FsGetMetadataParams;
|
|
use crate::protocol::FsGetMetadataResponse;
|
|
use crate::protocol::FsOpenParams;
|
|
use crate::protocol::FsOpenResponse;
|
|
use crate::protocol::FsReadBlockParams;
|
|
use crate::protocol::FsReadBlockResponse;
|
|
use crate::protocol::FsReadDirectoryEntry;
|
|
use crate::protocol::FsReadDirectoryParams;
|
|
use crate::protocol::FsReadDirectoryResponse;
|
|
use crate::protocol::FsReadFileParams;
|
|
use crate::protocol::FsReadFileResponse;
|
|
use crate::protocol::FsRemoveParams;
|
|
use crate::protocol::FsRemoveResponse;
|
|
use crate::protocol::FsWalkParams;
|
|
use crate::protocol::FsWalkResponse;
|
|
use crate::protocol::FsWriteFileParams;
|
|
use crate::protocol::FsWriteFileResponse;
|
|
use crate::rpc::internal_error;
|
|
use crate::rpc::invalid_request;
|
|
use crate::rpc::not_found;
|
|
|
|
const MAX_FILE_READ_HANDLE_ID_BYTES: usize = 32;
|
|
// Each read-directory entry needs four JSON values. Keep same-version
|
|
// producers comfortably below the shared 256K-value decoder budget.
|
|
const MAX_READ_DIRECTORY_ENTRIES: usize = 50_000;
|
|
|
|
#[derive(Clone)]
|
|
pub(crate) struct FileSystemHandler {
|
|
file_system: LocalFileSystem,
|
|
file_reads: FileReadHandleManager,
|
|
}
|
|
|
|
impl FileSystemHandler {
|
|
pub(crate) fn new(runtime_paths: ExecServerRuntimePaths) -> Self {
|
|
Self {
|
|
file_system: LocalFileSystem::with_runtime_paths(runtime_paths),
|
|
file_reads: FileReadHandleManager::default(),
|
|
}
|
|
}
|
|
|
|
pub(crate) async fn shutdown(&self) {
|
|
self.file_reads.close_all().await;
|
|
}
|
|
|
|
pub(crate) async fn discover_capability_roots(
|
|
&self,
|
|
params: CapabilityRootsDiscoverParams,
|
|
) -> Result<CapabilityRootsDiscoverResponse, JSONRPCErrorError> {
|
|
crate::discover_capability_roots(&self.file_system, params)
|
|
.await
|
|
.map_err(|error| invalid_request(error.to_string()))
|
|
}
|
|
|
|
pub(crate) async fn open(
|
|
&self,
|
|
params: FsOpenParams,
|
|
) -> Result<FsOpenResponse, JSONRPCErrorError> {
|
|
validate_file_read_handle_id(¶ms.handle_id)?;
|
|
let file = self
|
|
.file_system
|
|
.open_file_for_read(¶ms.path, params.sandbox.as_ref())
|
|
.await
|
|
.map_err(map_fs_error)?;
|
|
let handle_id = self
|
|
.file_reads
|
|
.open(params.handle_id, file)
|
|
.await
|
|
.map_err(map_fs_error)?;
|
|
Ok(FsOpenResponse { handle_id })
|
|
}
|
|
|
|
pub(crate) async fn read_block(
|
|
&self,
|
|
params: FsReadBlockParams,
|
|
) -> Result<FsReadBlockResponse, JSONRPCErrorError> {
|
|
validate_file_read_handle_id(¶ms.handle_id)?;
|
|
let block = self
|
|
.file_reads
|
|
.read_block(¶ms.handle_id, params.offset, params.len)
|
|
.await
|
|
.map_err(map_fs_error)?;
|
|
Ok(FsReadBlockResponse {
|
|
chunk: block.bytes.into(),
|
|
eof: block.eof,
|
|
})
|
|
}
|
|
|
|
pub(crate) async fn close(
|
|
&self,
|
|
params: FsCloseParams,
|
|
) -> Result<FsCloseResponse, JSONRPCErrorError> {
|
|
validate_file_read_handle_id(¶ms.handle_id)?;
|
|
self.file_reads.close(¶ms.handle_id).await;
|
|
Ok(FsCloseResponse {})
|
|
}
|
|
|
|
pub(crate) async fn read_file(
|
|
&self,
|
|
params: FsReadFileParams,
|
|
) -> Result<FsReadFileResponse, JSONRPCErrorError> {
|
|
let bytes = self
|
|
.file_system
|
|
.read_file(¶ms.path, params.sandbox.as_ref())
|
|
.await
|
|
.map_err(map_fs_error)?;
|
|
Ok(FsReadFileResponse {
|
|
data_base64: STANDARD.encode(bytes),
|
|
})
|
|
}
|
|
|
|
pub(crate) async fn write_file(
|
|
&self,
|
|
params: FsWriteFileParams,
|
|
) -> Result<FsWriteFileResponse, JSONRPCErrorError> {
|
|
let bytes = STANDARD.decode(params.data_base64).map_err(|err| {
|
|
invalid_request(format!(
|
|
"{FS_WRITE_FILE_METHOD} requires valid base64 dataBase64: {err}"
|
|
))
|
|
})?;
|
|
self.file_system
|
|
.write_file(¶ms.path, bytes, params.sandbox.as_ref())
|
|
.await
|
|
.map_err(map_fs_error)?;
|
|
Ok(FsWriteFileResponse {})
|
|
}
|
|
|
|
pub(crate) async fn create_directory(
|
|
&self,
|
|
params: FsCreateDirectoryParams,
|
|
) -> Result<FsCreateDirectoryResponse, JSONRPCErrorError> {
|
|
let recursive = params.recursive.unwrap_or(true);
|
|
self.file_system
|
|
.create_directory(
|
|
¶ms.path,
|
|
CreateDirectoryOptions { recursive },
|
|
params.sandbox.as_ref(),
|
|
)
|
|
.await
|
|
.map_err(map_fs_error)?;
|
|
Ok(FsCreateDirectoryResponse {})
|
|
}
|
|
|
|
pub(crate) async fn get_metadata(
|
|
&self,
|
|
params: FsGetMetadataParams,
|
|
) -> Result<FsGetMetadataResponse, JSONRPCErrorError> {
|
|
let metadata = self
|
|
.file_system
|
|
.get_metadata(¶ms.path, params.sandbox.as_ref())
|
|
.await
|
|
.map_err(map_fs_error)?;
|
|
Ok(FsGetMetadataResponse {
|
|
is_directory: metadata.is_directory,
|
|
is_file: metadata.is_file,
|
|
is_symlink: metadata.is_symlink,
|
|
size: metadata.size,
|
|
created_at_ms: metadata.created_at_ms,
|
|
modified_at_ms: metadata.modified_at_ms,
|
|
})
|
|
}
|
|
|
|
pub(crate) async fn canonicalize(
|
|
&self,
|
|
params: FsCanonicalizeParams,
|
|
) -> Result<FsCanonicalizeResponse, JSONRPCErrorError> {
|
|
let path = self
|
|
.file_system
|
|
.canonicalize(¶ms.path, params.sandbox.as_ref())
|
|
.await
|
|
.map_err(map_fs_error)?;
|
|
Ok(FsCanonicalizeResponse { path })
|
|
}
|
|
|
|
pub(crate) async fn read_directory(
|
|
&self,
|
|
params: FsReadDirectoryParams,
|
|
) -> Result<FsReadDirectoryResponse, JSONRPCErrorError> {
|
|
let entries = self
|
|
.file_system
|
|
.read_directory(¶ms.path, params.sandbox.as_ref())
|
|
.await
|
|
.map_err(map_fs_error)?;
|
|
let entry_count = entries.len();
|
|
if entry_count > MAX_READ_DIRECTORY_ENTRIES {
|
|
return Err(internal_error(format!(
|
|
"{FS_READ_DIRECTORY_METHOD} returned {entry_count} entries; limit is {MAX_READ_DIRECTORY_ENTRIES}"
|
|
)));
|
|
}
|
|
let entries = entries
|
|
.into_iter()
|
|
.map(|entry| FsReadDirectoryEntry {
|
|
file_name: entry.file_name,
|
|
is_directory: entry.is_directory,
|
|
is_file: entry.is_file,
|
|
})
|
|
.collect();
|
|
Ok(FsReadDirectoryResponse { entries })
|
|
}
|
|
|
|
pub(crate) async fn walk(
|
|
&self,
|
|
params: FsWalkParams,
|
|
) -> Result<FsWalkResponse, JSONRPCErrorError> {
|
|
self.file_system
|
|
.walk(¶ms.path, params.options, params.sandbox.as_ref())
|
|
.await
|
|
.map_err(map_fs_error)
|
|
}
|
|
|
|
pub(crate) async fn remove(
|
|
&self,
|
|
params: FsRemoveParams,
|
|
) -> Result<FsRemoveResponse, JSONRPCErrorError> {
|
|
let recursive = params.recursive.unwrap_or(true);
|
|
let force = params.force.unwrap_or(true);
|
|
self.file_system
|
|
.remove(
|
|
¶ms.path,
|
|
RemoveOptions { recursive, force },
|
|
params.sandbox.as_ref(),
|
|
)
|
|
.await
|
|
.map_err(map_fs_error)?;
|
|
Ok(FsRemoveResponse {})
|
|
}
|
|
|
|
pub(crate) async fn copy(
|
|
&self,
|
|
params: FsCopyParams,
|
|
) -> Result<FsCopyResponse, JSONRPCErrorError> {
|
|
self.file_system
|
|
.copy(
|
|
¶ms.source_path,
|
|
¶ms.destination_path,
|
|
CopyOptions {
|
|
recursive: params.recursive,
|
|
},
|
|
params.sandbox.as_ref(),
|
|
)
|
|
.await
|
|
.map_err(map_fs_error)?;
|
|
Ok(FsCopyResponse {})
|
|
}
|
|
}
|
|
|
|
fn validate_file_read_handle_id(handle_id: &str) -> Result<(), JSONRPCErrorError> {
|
|
if handle_id.len() > MAX_FILE_READ_HANDLE_ID_BYTES {
|
|
return Err(invalid_request(format!(
|
|
"file read handle ID must not exceed {MAX_FILE_READ_HANDLE_ID_BYTES} bytes"
|
|
)));
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
fn map_fs_error(err: io::Error) -> JSONRPCErrorError {
|
|
match err.kind() {
|
|
io::ErrorKind::NotFound => not_found(err.to_string()),
|
|
io::ErrorKind::InvalidInput | io::ErrorKind::PermissionDenied => {
|
|
invalid_request(err.to_string())
|
|
}
|
|
_ => internal_error(err.to_string()),
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use codex_protocol::protocol::NetworkAccess;
|
|
use codex_protocol::protocol::SandboxPolicy;
|
|
use codex_utils_path_uri::PathUri;
|
|
use pretty_assertions::assert_eq;
|
|
|
|
use super::*;
|
|
use crate::FileSystemSandboxContext;
|
|
use crate::protocol::FsReadFileParams;
|
|
use crate::protocol::FsWriteFileParams;
|
|
|
|
#[tokio::test]
|
|
async fn no_platform_sandbox_policies_do_not_require_configured_sandbox_helper() {
|
|
let temp_dir = tempfile::tempdir().expect("tempdir");
|
|
let runtime_paths = ExecServerRuntimePaths::new(
|
|
std::env::current_exe().expect("current exe"),
|
|
/*codex_linux_sandbox_exe*/ None,
|
|
)
|
|
.expect("runtime paths");
|
|
let handler = FileSystemHandler::new(runtime_paths);
|
|
let sandbox_cwd = PathUri::from_host_native_path(temp_dir.path()).expect("tempdir URI");
|
|
let sandbox_context = |sandbox_policy| {
|
|
FileSystemSandboxContext::from_legacy_sandbox_policy(
|
|
sandbox_policy,
|
|
sandbox_cwd.clone(),
|
|
)
|
|
.expect("sandbox context")
|
|
};
|
|
|
|
for (file_name, sandbox_policy) in [
|
|
("danger.txt", SandboxPolicy::DangerFullAccess),
|
|
(
|
|
"external.txt",
|
|
SandboxPolicy::ExternalSandbox {
|
|
network_access: NetworkAccess::Restricted,
|
|
},
|
|
),
|
|
] {
|
|
let path =
|
|
PathUri::from_host_native_path(temp_dir.path().join(file_name)).expect("path URI");
|
|
|
|
handler
|
|
.write_file(FsWriteFileParams {
|
|
path: path.clone(),
|
|
data_base64: STANDARD.encode("ok"),
|
|
sandbox: Some(sandbox_context(sandbox_policy.clone())),
|
|
})
|
|
.await
|
|
.expect("write file");
|
|
|
|
let canonicalized = handler
|
|
.canonicalize(FsCanonicalizeParams {
|
|
path: path.clone(),
|
|
sandbox: Some(sandbox_context(sandbox_policy.clone())),
|
|
})
|
|
.await
|
|
.expect("canonicalize file");
|
|
assert_eq!(
|
|
canonicalized.path,
|
|
PathUri::from_host_native_path(
|
|
std::fs::canonicalize(temp_dir.path().join(file_name)).expect("canonical path"),
|
|
)
|
|
.expect("canonical path URI"),
|
|
);
|
|
|
|
let response = handler
|
|
.read_file(FsReadFileParams {
|
|
path,
|
|
sandbox: Some(sandbox_context(sandbox_policy)),
|
|
})
|
|
.await
|
|
.expect("read file");
|
|
|
|
assert_eq!(response.data_base64, STANDARD.encode("ok"));
|
|
}
|
|
}
|
|
}
|