mirror of
https://github.com/openai/codex.git
synced 2026-09-14 11:57:03 +00:00
## Why `zsh-fork` sessions launched through unified-exec need the escalation socket to survive the wrapper -> server -> child handoff so later intercepted `exec()` calls can still reach the escalation server. The inherited-fd spawn path also needs to avoid closing Rust's internal exec-error pipe, and the shell-escalation handoff needs to tolerate the receive-side case where a transferred fd is installed into the same stdio slot it will be mapped onto. ## What Changed - Added `SpawnLifecycle::inherited_fds()` in `codex-rs/core/src/unified_exec/process.rs` and threaded inherited fds through `codex-rs/core/src/unified_exec/process_manager.rs` so unified-exec can preserve required descriptors across both PTY and no-stdin pipe spawn paths. - Updated `codex-rs/core/src/tools/runtimes/shell/zsh_fork_backend.rs` to expose the escalation socket fd through the spawn lifecycle. - Added inherited-fd-aware spawn helpers in `codex-rs/utils/pty/src/pty.rs` and `codex-rs/utils/pty/src/pipe.rs`, including Unix pre-exec fd pruning that preserves requested inherited fds while leaving `FD_CLOEXEC` descriptors alone. The pruning helper is now named `close_inherited_fds_except()` to better describe that behavior. - Updated `codex-rs/shell-escalation/src/unix/escalate_client.rs` to duplicate local stdio before transfer and send destination stdio numbers in `SuperExecMessage`, so the wrapper keeps using its own `stdin`/`stdout`/`stderr` until the escalated child takes over. - Updated `codex-rs/shell-escalation/src/unix/escalate_server.rs` so the server accepts the overlap case where a received fd reuses the same stdio descriptor number that the child setup will target with `dup2`. - Added comments around the PTY stdio wiring and the overlap regression helper to make the fd handoff and controlling-terminal setup easier to follow. ## Verification - `cargo test -p codex-utils-pty` - covers preserved-fd PTY spawn behavior, PTY resize, Python REPL continuity, exec-failure reporting, and the no-stdin pipe path - `cargo test -p codex-shell-escalation` - covers duplicated-fd transfer on the client side and verifies the overlap case by passing a pipe-backed stdin payload through the server-side `dup2` path --- [//]: # (BEGIN SAPLING FOOTER) Stack created with [Sapling](https://sapling-scm.com). Best reviewed with [ReviewStack](https://reviewstack.dev/openai/codex/pull/13644). * #14624 * __->__ #13644
275 lines
8.9 KiB
Rust
275 lines
8.9 KiB
Rust
#![allow(clippy::module_inception)]
|
|
|
|
use std::sync::Arc;
|
|
use std::sync::atomic::AtomicBool;
|
|
use std::sync::atomic::Ordering;
|
|
use tokio::sync::Mutex;
|
|
use tokio::sync::Notify;
|
|
use tokio::sync::broadcast;
|
|
use tokio::sync::mpsc;
|
|
use tokio::sync::oneshot::error::TryRecvError;
|
|
use tokio::task::JoinHandle;
|
|
use tokio::time::Duration;
|
|
use tokio_util::sync::CancellationToken;
|
|
|
|
use crate::exec::ExecToolCallOutput;
|
|
use crate::exec::SandboxType;
|
|
use crate::exec::StreamOutput;
|
|
use crate::exec::is_likely_sandbox_denied;
|
|
use crate::truncate::TruncationPolicy;
|
|
use crate::truncate::formatted_truncate_text;
|
|
use codex_utils_pty::ExecCommandSession;
|
|
use codex_utils_pty::SpawnedPty;
|
|
|
|
use super::UNIFIED_EXEC_OUTPUT_MAX_TOKENS;
|
|
use super::UnifiedExecError;
|
|
use super::head_tail_buffer::HeadTailBuffer;
|
|
|
|
pub(crate) trait SpawnLifecycle: std::fmt::Debug + Send + Sync {
|
|
/// Returns file descriptors that must stay open across the child `exec()`.
|
|
///
|
|
/// The returned descriptors must already be valid in the parent process and
|
|
/// stay valid until `after_spawn()` runs, which is the first point where
|
|
/// the parent may release its copies.
|
|
fn inherited_fds(&self) -> Vec<i32> {
|
|
Vec::new()
|
|
}
|
|
|
|
fn after_spawn(&mut self) {}
|
|
}
|
|
|
|
pub(crate) type SpawnLifecycleHandle = Box<dyn SpawnLifecycle>;
|
|
|
|
#[derive(Debug, Default)]
|
|
pub(crate) struct NoopSpawnLifecycle;
|
|
|
|
impl SpawnLifecycle for NoopSpawnLifecycle {}
|
|
|
|
pub(crate) type OutputBuffer = Arc<Mutex<HeadTailBuffer>>;
|
|
pub(crate) struct OutputHandles {
|
|
pub(crate) output_buffer: OutputBuffer,
|
|
pub(crate) output_notify: Arc<Notify>,
|
|
pub(crate) output_closed: Arc<AtomicBool>,
|
|
pub(crate) output_closed_notify: Arc<Notify>,
|
|
pub(crate) cancellation_token: CancellationToken,
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
pub(crate) struct UnifiedExecProcess {
|
|
process_handle: ExecCommandSession,
|
|
output_rx: broadcast::Receiver<Vec<u8>>,
|
|
output_buffer: OutputBuffer,
|
|
output_notify: Arc<Notify>,
|
|
output_closed: Arc<AtomicBool>,
|
|
output_closed_notify: Arc<Notify>,
|
|
cancellation_token: CancellationToken,
|
|
output_drained: Arc<Notify>,
|
|
output_task: JoinHandle<()>,
|
|
sandbox_type: SandboxType,
|
|
_spawn_lifecycle: SpawnLifecycleHandle,
|
|
}
|
|
|
|
impl UnifiedExecProcess {
|
|
pub(super) fn new(
|
|
process_handle: ExecCommandSession,
|
|
initial_output_rx: tokio::sync::broadcast::Receiver<Vec<u8>>,
|
|
sandbox_type: SandboxType,
|
|
spawn_lifecycle: SpawnLifecycleHandle,
|
|
) -> Self {
|
|
let output_buffer = Arc::new(Mutex::new(HeadTailBuffer::default()));
|
|
let output_notify = Arc::new(Notify::new());
|
|
let output_closed = Arc::new(AtomicBool::new(false));
|
|
let output_closed_notify = Arc::new(Notify::new());
|
|
let cancellation_token = CancellationToken::new();
|
|
let output_drained = Arc::new(Notify::new());
|
|
let mut receiver = initial_output_rx;
|
|
let output_rx = receiver.resubscribe();
|
|
let buffer_clone = Arc::clone(&output_buffer);
|
|
let notify_clone = Arc::clone(&output_notify);
|
|
let output_closed_clone = Arc::clone(&output_closed);
|
|
let output_closed_notify_clone = Arc::clone(&output_closed_notify);
|
|
let output_task = tokio::spawn(async move {
|
|
loop {
|
|
match receiver.recv().await {
|
|
Ok(chunk) => {
|
|
let mut guard = buffer_clone.lock().await;
|
|
guard.push_chunk(chunk);
|
|
drop(guard);
|
|
notify_clone.notify_waiters();
|
|
}
|
|
Err(tokio::sync::broadcast::error::RecvError::Lagged(_)) => continue,
|
|
Err(tokio::sync::broadcast::error::RecvError::Closed) => {
|
|
output_closed_clone.store(true, Ordering::Release);
|
|
output_closed_notify_clone.notify_waiters();
|
|
break;
|
|
}
|
|
};
|
|
}
|
|
});
|
|
|
|
Self {
|
|
process_handle,
|
|
output_rx,
|
|
output_buffer,
|
|
output_notify,
|
|
output_closed,
|
|
output_closed_notify,
|
|
cancellation_token,
|
|
output_drained,
|
|
output_task,
|
|
sandbox_type,
|
|
_spawn_lifecycle: spawn_lifecycle,
|
|
}
|
|
}
|
|
|
|
pub(super) fn writer_sender(&self) -> mpsc::Sender<Vec<u8>> {
|
|
self.process_handle.writer_sender()
|
|
}
|
|
|
|
pub(super) fn output_handles(&self) -> OutputHandles {
|
|
OutputHandles {
|
|
output_buffer: Arc::clone(&self.output_buffer),
|
|
output_notify: Arc::clone(&self.output_notify),
|
|
output_closed: Arc::clone(&self.output_closed),
|
|
output_closed_notify: Arc::clone(&self.output_closed_notify),
|
|
cancellation_token: self.cancellation_token.clone(),
|
|
}
|
|
}
|
|
|
|
pub(super) fn output_receiver(&self) -> tokio::sync::broadcast::Receiver<Vec<u8>> {
|
|
self.output_rx.resubscribe()
|
|
}
|
|
|
|
pub(super) fn cancellation_token(&self) -> CancellationToken {
|
|
self.cancellation_token.clone()
|
|
}
|
|
|
|
pub(super) fn output_drained_notify(&self) -> Arc<Notify> {
|
|
Arc::clone(&self.output_drained)
|
|
}
|
|
|
|
pub(super) fn has_exited(&self) -> bool {
|
|
self.process_handle.has_exited()
|
|
}
|
|
|
|
pub(super) fn exit_code(&self) -> Option<i32> {
|
|
self.process_handle.exit_code()
|
|
}
|
|
|
|
pub(super) fn terminate(&self) {
|
|
self.output_closed.store(true, Ordering::Release);
|
|
self.output_closed_notify.notify_waiters();
|
|
self.process_handle.terminate();
|
|
self.cancellation_token.cancel();
|
|
self.output_task.abort();
|
|
}
|
|
|
|
async fn snapshot_output(&self) -> Vec<Vec<u8>> {
|
|
let guard = self.output_buffer.lock().await;
|
|
guard.snapshot_chunks()
|
|
}
|
|
|
|
pub(crate) fn sandbox_type(&self) -> SandboxType {
|
|
self.sandbox_type
|
|
}
|
|
|
|
pub(super) async fn check_for_sandbox_denial(&self) -> Result<(), UnifiedExecError> {
|
|
let _ =
|
|
tokio::time::timeout(Duration::from_millis(20), self.output_notify.notified()).await;
|
|
|
|
let collected_chunks = self.snapshot_output().await;
|
|
let mut aggregated: Vec<u8> = Vec::new();
|
|
for chunk in collected_chunks {
|
|
aggregated.extend_from_slice(&chunk);
|
|
}
|
|
let aggregated_text = String::from_utf8_lossy(&aggregated).to_string();
|
|
self.check_for_sandbox_denial_with_text(&aggregated_text)
|
|
.await?;
|
|
|
|
Ok(())
|
|
}
|
|
|
|
pub(super) async fn check_for_sandbox_denial_with_text(
|
|
&self,
|
|
text: &str,
|
|
) -> Result<(), UnifiedExecError> {
|
|
let sandbox_type = self.sandbox_type();
|
|
if sandbox_type == SandboxType::None || !self.has_exited() {
|
|
return Ok(());
|
|
}
|
|
|
|
let exit_code = self.exit_code().unwrap_or(-1);
|
|
let exec_output = ExecToolCallOutput {
|
|
exit_code,
|
|
stderr: StreamOutput::new(text.to_string()),
|
|
aggregated_output: StreamOutput::new(text.to_string()),
|
|
..Default::default()
|
|
};
|
|
if is_likely_sandbox_denied(sandbox_type, &exec_output) {
|
|
let snippet = formatted_truncate_text(
|
|
text,
|
|
TruncationPolicy::Tokens(UNIFIED_EXEC_OUTPUT_MAX_TOKENS),
|
|
);
|
|
let message = if snippet.is_empty() {
|
|
format!("Process exited with code {exit_code}")
|
|
} else {
|
|
snippet
|
|
};
|
|
return Err(UnifiedExecError::sandbox_denied(message, exec_output));
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
pub(super) async fn from_spawned(
|
|
spawned: SpawnedPty,
|
|
sandbox_type: SandboxType,
|
|
spawn_lifecycle: SpawnLifecycleHandle,
|
|
) -> Result<Self, UnifiedExecError> {
|
|
let SpawnedPty {
|
|
session: process_handle,
|
|
stdout_rx,
|
|
stderr_rx,
|
|
mut exit_rx,
|
|
} = spawned;
|
|
let output_rx = codex_utils_pty::combine_output_receivers(stdout_rx, stderr_rx);
|
|
let managed = Self::new(process_handle, output_rx, sandbox_type, spawn_lifecycle);
|
|
|
|
let exit_ready = matches!(exit_rx.try_recv(), Ok(_) | Err(TryRecvError::Closed));
|
|
|
|
if exit_ready {
|
|
managed.signal_exit();
|
|
managed.check_for_sandbox_denial().await?;
|
|
return Ok(managed);
|
|
}
|
|
|
|
if tokio::time::timeout(Duration::from_millis(150), &mut exit_rx)
|
|
.await
|
|
.is_ok()
|
|
{
|
|
managed.signal_exit();
|
|
managed.check_for_sandbox_denial().await?;
|
|
return Ok(managed);
|
|
}
|
|
|
|
tokio::spawn({
|
|
let cancellation_token = managed.cancellation_token.clone();
|
|
async move {
|
|
let _ = exit_rx.await;
|
|
cancellation_token.cancel();
|
|
}
|
|
});
|
|
|
|
Ok(managed)
|
|
}
|
|
|
|
fn signal_exit(&self) {
|
|
self.cancellation_token.cancel();
|
|
}
|
|
}
|
|
|
|
impl Drop for UnifiedExecProcess {
|
|
fn drop(&mut self) {
|
|
self.terminate();
|
|
}
|
|
}
|