mirror of
https://github.com/pchuan98/codex.git
synced 2026-07-01 00:31:56 +08:00
## Why First-party async traits should expose their `Send` contracts explicitly without requiring `async_trait`. This completes the migration pattern established in #27303 and #27304. ## What changed - Replaced the remaining first-party `async_trait` traits with native return-position `impl Future + Send` where statically dispatched and explicit boxed `Send` futures where object safety is required. - Kept implementations behavior-preserving, outlining existing async bodies into inherent methods where that keeps the diff reviewable. - Removed all direct first-party `async-trait` dependencies and the workspace dependency declaration. - Added a cargo-deny policy that permits `async-trait` only through the remaining transitive wrapper crates. - Updated `rand` from 0.8.5 to 0.8.6 to resolve RUSTSEC-2026-0097 and keep the full cargo-deny check passing. ## Validation - `just test -p codex-exec-server`: 216 passed, 2 skipped. - `just test -p codex-model-provider`: 39 passed. - `just test -p codex-core` and `just test`: changed tests passed; remaining failures are environment-sensitive suites unrelated to this migration. - `cargo deny check` - `just fix` - `just fmt` - `cargo shear` - `just bazel-lock-check`
127 lines
3.4 KiB
Rust
127 lines
3.4 KiB
Rust
use std::sync::Arc;
|
|
|
|
use tokio::sync::watch;
|
|
use tracing::trace;
|
|
|
|
use crate::ExecBackend;
|
|
use crate::ExecBackendFuture;
|
|
use crate::ExecProcess;
|
|
use crate::ExecProcessEventReceiver;
|
|
use crate::ExecProcessFuture;
|
|
use crate::StartedExecProcess;
|
|
use crate::client::LazyRemoteExecServerClient;
|
|
use crate::client::Session;
|
|
use crate::protocol::ExecParams;
|
|
use crate::protocol::ProcessSignal;
|
|
use crate::protocol::ReadResponse;
|
|
use crate::protocol::WriteResponse;
|
|
|
|
#[derive(Clone)]
|
|
pub(crate) struct RemoteProcess {
|
|
client: LazyRemoteExecServerClient,
|
|
}
|
|
|
|
struct RemoteExecProcess {
|
|
session: Session,
|
|
}
|
|
|
|
impl RemoteProcess {
|
|
pub(crate) fn new(client: LazyRemoteExecServerClient) -> Self {
|
|
trace!("remote process new");
|
|
Self { client }
|
|
}
|
|
|
|
async fn start(
|
|
&self,
|
|
params: ExecParams,
|
|
) -> Result<StartedExecProcess, crate::ExecServerError> {
|
|
let process_id = params.process_id.clone();
|
|
let client = self.client.get().await?;
|
|
let session = client.register_session(&process_id).await?;
|
|
if let Err(err) = client.exec(params).await {
|
|
session.unregister().await;
|
|
return Err(err);
|
|
}
|
|
|
|
Ok(StartedExecProcess {
|
|
process: Arc::new(RemoteExecProcess { session }),
|
|
})
|
|
}
|
|
}
|
|
|
|
impl ExecBackend for RemoteProcess {
|
|
fn start(&self, params: ExecParams) -> ExecBackendFuture<'_> {
|
|
Box::pin(RemoteProcess::start(self, params))
|
|
}
|
|
}
|
|
|
|
impl RemoteExecProcess {
|
|
async fn read(
|
|
&self,
|
|
after_seq: Option<u64>,
|
|
max_bytes: Option<usize>,
|
|
wait_ms: Option<u64>,
|
|
) -> Result<ReadResponse, crate::ExecServerError> {
|
|
self.session.read(after_seq, max_bytes, wait_ms).await
|
|
}
|
|
|
|
async fn write(&self, chunk: Vec<u8>) -> Result<WriteResponse, crate::ExecServerError> {
|
|
trace!("exec process write");
|
|
self.session.write(chunk).await
|
|
}
|
|
|
|
async fn signal(&self, signal: ProcessSignal) -> Result<(), crate::ExecServerError> {
|
|
trace!("exec process signal");
|
|
self.session.signal(signal).await
|
|
}
|
|
|
|
async fn terminate(&self) -> Result<(), crate::ExecServerError> {
|
|
trace!("exec process terminate");
|
|
self.session.terminate().await
|
|
}
|
|
}
|
|
|
|
impl ExecProcess for RemoteExecProcess {
|
|
fn process_id(&self) -> &crate::ProcessId {
|
|
self.session.process_id()
|
|
}
|
|
|
|
fn subscribe_wake(&self) -> watch::Receiver<u64> {
|
|
self.session.subscribe_wake()
|
|
}
|
|
|
|
fn subscribe_events(&self) -> ExecProcessEventReceiver {
|
|
self.session.subscribe_events()
|
|
}
|
|
|
|
fn read(
|
|
&self,
|
|
after_seq: Option<u64>,
|
|
max_bytes: Option<usize>,
|
|
wait_ms: Option<u64>,
|
|
) -> ExecProcessFuture<'_, ReadResponse> {
|
|
Box::pin(RemoteExecProcess::read(self, after_seq, max_bytes, wait_ms))
|
|
}
|
|
|
|
fn write(&self, chunk: Vec<u8>) -> ExecProcessFuture<'_, WriteResponse> {
|
|
Box::pin(RemoteExecProcess::write(self, chunk))
|
|
}
|
|
|
|
fn signal(&self, signal: ProcessSignal) -> ExecProcessFuture<'_, ()> {
|
|
Box::pin(RemoteExecProcess::signal(self, signal))
|
|
}
|
|
|
|
fn terminate(&self) -> ExecProcessFuture<'_, ()> {
|
|
Box::pin(RemoteExecProcess::terminate(self))
|
|
}
|
|
}
|
|
|
|
impl Drop for RemoteExecProcess {
|
|
fn drop(&mut self) {
|
|
let session = self.session.clone();
|
|
tokio::spawn(async move {
|
|
session.unregister().await;
|
|
});
|
|
}
|
|
}
|