mirror of
https://github.com/openai/codex.git
synced 2026-11-17 22:10:37 +00:00
## Summary - add executor filesystem canonicalization as a bound-path operation - route remote canonicalization through the exec-server filesystem RPC surface - keep path normalization attached to the filesystem that owns the path ## Stack - 2/5 in the skills path authority stack extracted from https://github.com/openai/codex/pull/25098 - follows merged https://github.com/openai/codex/pull/25121 ## Validation - `cd /Users/starr/code/codex-worktrees/pr-25098-restack-review-pr1b/codex-rs && just fmt` - Not run: tests/checks (not requested) - GitHub CI pending on rewritten head
143 lines
4.7 KiB
Rust
143 lines
4.7 KiB
Rust
use std::sync::Arc;
|
|
|
|
use crate::protocol::EXEC_METHOD;
|
|
use crate::protocol::EXEC_READ_METHOD;
|
|
use crate::protocol::EXEC_TERMINATE_METHOD;
|
|
use crate::protocol::EXEC_WRITE_METHOD;
|
|
use crate::protocol::ExecParams;
|
|
use crate::protocol::FS_CANONICALIZE_METHOD;
|
|
use crate::protocol::FS_COPY_METHOD;
|
|
use crate::protocol::FS_CREATE_DIRECTORY_METHOD;
|
|
use crate::protocol::FS_GET_METADATA_METHOD;
|
|
use crate::protocol::FS_JOIN_METHOD;
|
|
use crate::protocol::FS_PARENT_METHOD;
|
|
use crate::protocol::FS_READ_DIRECTORY_METHOD;
|
|
use crate::protocol::FS_READ_FILE_METHOD;
|
|
use crate::protocol::FS_REMOVE_METHOD;
|
|
use crate::protocol::FS_WRITE_FILE_METHOD;
|
|
use crate::protocol::FsCanonicalizeParams;
|
|
use crate::protocol::FsCopyParams;
|
|
use crate::protocol::FsCreateDirectoryParams;
|
|
use crate::protocol::FsGetMetadataParams;
|
|
use crate::protocol::FsJoinParams;
|
|
use crate::protocol::FsParentParams;
|
|
use crate::protocol::FsReadDirectoryParams;
|
|
use crate::protocol::FsReadFileParams;
|
|
use crate::protocol::FsRemoveParams;
|
|
use crate::protocol::FsWriteFileParams;
|
|
use crate::protocol::HTTP_REQUEST_METHOD;
|
|
use crate::protocol::HttpRequestParams;
|
|
use crate::protocol::INITIALIZE_METHOD;
|
|
use crate::protocol::INITIALIZED_METHOD;
|
|
use crate::protocol::InitializeParams;
|
|
use crate::protocol::ReadParams;
|
|
use crate::protocol::TerminateParams;
|
|
use crate::protocol::WriteParams;
|
|
use crate::rpc::RpcRouter;
|
|
use crate::server::ExecServerHandler;
|
|
|
|
pub(crate) fn build_router() -> RpcRouter<ExecServerHandler> {
|
|
let mut router = RpcRouter::new();
|
|
router.notification(
|
|
INITIALIZED_METHOD,
|
|
|handler: Arc<ExecServerHandler>, _params: serde_json::Value| async move {
|
|
handler.initialized()
|
|
},
|
|
);
|
|
router.request(
|
|
INITIALIZE_METHOD,
|
|
|handler: Arc<ExecServerHandler>, params: InitializeParams| async move {
|
|
handler.initialize(params).await
|
|
},
|
|
);
|
|
router.request_with_id(
|
|
HTTP_REQUEST_METHOD,
|
|
|handler: Arc<ExecServerHandler>, request_id, params: HttpRequestParams| async move {
|
|
handler.http_request(request_id, params).await
|
|
},
|
|
);
|
|
router.request(
|
|
EXEC_METHOD,
|
|
|handler: Arc<ExecServerHandler>, params: ExecParams| async move { handler.exec(params).await },
|
|
);
|
|
router.request(
|
|
EXEC_READ_METHOD,
|
|
|handler: Arc<ExecServerHandler>, params: ReadParams| async move {
|
|
handler.exec_read(params).await
|
|
},
|
|
);
|
|
router.request(
|
|
EXEC_WRITE_METHOD,
|
|
|handler: Arc<ExecServerHandler>, params: WriteParams| async move {
|
|
handler.exec_write(params).await
|
|
},
|
|
);
|
|
router.request(
|
|
EXEC_TERMINATE_METHOD,
|
|
|handler: Arc<ExecServerHandler>, params: TerminateParams| async move {
|
|
handler.terminate(params).await
|
|
},
|
|
);
|
|
router.request(
|
|
FS_READ_FILE_METHOD,
|
|
|handler: Arc<ExecServerHandler>, params: FsReadFileParams| async move {
|
|
handler.fs_read_file(params).await
|
|
},
|
|
);
|
|
router.request(
|
|
FS_WRITE_FILE_METHOD,
|
|
|handler: Arc<ExecServerHandler>, params: FsWriteFileParams| async move {
|
|
handler.fs_write_file(params).await
|
|
},
|
|
);
|
|
router.request(
|
|
FS_CREATE_DIRECTORY_METHOD,
|
|
|handler: Arc<ExecServerHandler>, params: FsCreateDirectoryParams| async move {
|
|
handler.fs_create_directory(params).await
|
|
},
|
|
);
|
|
router.request(
|
|
FS_GET_METADATA_METHOD,
|
|
|handler: Arc<ExecServerHandler>, params: FsGetMetadataParams| async move {
|
|
handler.fs_get_metadata(params).await
|
|
},
|
|
);
|
|
router.request(
|
|
FS_CANONICALIZE_METHOD,
|
|
|handler: Arc<ExecServerHandler>, params: FsCanonicalizeParams| async move {
|
|
handler.fs_canonicalize(params).await
|
|
},
|
|
);
|
|
router.request(
|
|
FS_JOIN_METHOD,
|
|
|handler: Arc<ExecServerHandler>, params: FsJoinParams| async move {
|
|
handler.fs_join(params).await
|
|
},
|
|
);
|
|
router.request(
|
|
FS_PARENT_METHOD,
|
|
|handler: Arc<ExecServerHandler>, params: FsParentParams| async move {
|
|
handler.fs_parent(params).await
|
|
},
|
|
);
|
|
router.request(
|
|
FS_READ_DIRECTORY_METHOD,
|
|
|handler: Arc<ExecServerHandler>, params: FsReadDirectoryParams| async move {
|
|
handler.fs_read_directory(params).await
|
|
},
|
|
);
|
|
router.request(
|
|
FS_REMOVE_METHOD,
|
|
|handler: Arc<ExecServerHandler>, params: FsRemoveParams| async move {
|
|
handler.fs_remove(params).await
|
|
},
|
|
);
|
|
router.request(
|
|
FS_COPY_METHOD,
|
|
|handler: Arc<ExecServerHandler>, params: FsCopyParams| async move {
|
|
handler.fs_copy(params).await
|
|
},
|
|
);
|
|
router
|
|
}
|