## 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
294 lines
7.9 KiB
Rust
294 lines
7.9 KiB
Rust
use std::collections::HashMap;
|
|
use std::io;
|
|
use std::io::ErrorKind;
|
|
use std::path::Path;
|
|
use std::process::Stdio;
|
|
use std::sync::atomic::AtomicBool;
|
|
use std::sync::Arc;
|
|
use std::sync::Mutex as StdMutex;
|
|
|
|
use anyhow::Result;
|
|
use tokio::io::AsyncRead;
|
|
use tokio::io::AsyncReadExt;
|
|
use tokio::io::AsyncWriteExt;
|
|
use tokio::io::BufReader;
|
|
use tokio::process::Command;
|
|
use tokio::sync::mpsc;
|
|
use tokio::sync::oneshot;
|
|
use tokio::task::JoinHandle;
|
|
|
|
use crate::process::ChildTerminator;
|
|
use crate::process::ProcessHandle;
|
|
use crate::process::SpawnedProcess;
|
|
|
|
#[cfg(target_os = "linux")]
|
|
use libc;
|
|
|
|
struct PipeChildTerminator {
|
|
#[cfg(windows)]
|
|
pid: u32,
|
|
#[cfg(unix)]
|
|
process_group_id: u32,
|
|
}
|
|
|
|
impl ChildTerminator for PipeChildTerminator {
|
|
fn kill(&mut self) -> io::Result<()> {
|
|
#[cfg(unix)]
|
|
{
|
|
crate::process_group::kill_process_group(self.process_group_id)
|
|
}
|
|
|
|
#[cfg(windows)]
|
|
{
|
|
kill_process(self.pid)
|
|
}
|
|
|
|
#[cfg(not(any(unix, windows)))]
|
|
{
|
|
Ok(())
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(windows)]
|
|
fn kill_process(pid: u32) -> io::Result<()> {
|
|
unsafe {
|
|
let handle = winapi::um::processthreadsapi::OpenProcess(
|
|
winapi::um::winnt::PROCESS_TERMINATE,
|
|
0,
|
|
pid,
|
|
);
|
|
if handle.is_null() {
|
|
return Err(io::Error::last_os_error());
|
|
}
|
|
let success = winapi::um::processthreadsapi::TerminateProcess(handle, 1);
|
|
let err = io::Error::last_os_error();
|
|
winapi::um::handleapi::CloseHandle(handle);
|
|
if success == 0 {
|
|
Err(err)
|
|
} else {
|
|
Ok(())
|
|
}
|
|
}
|
|
}
|
|
|
|
async fn read_output_stream<R>(mut reader: R, output_tx: mpsc::Sender<Vec<u8>>)
|
|
where
|
|
R: AsyncRead + Unpin,
|
|
{
|
|
let mut buf = vec![0u8; 8_192];
|
|
loop {
|
|
match reader.read(&mut buf).await {
|
|
Ok(0) => break,
|
|
Ok(n) => {
|
|
let _ = output_tx.send(buf[..n].to_vec()).await;
|
|
}
|
|
Err(ref e) if e.kind() == ErrorKind::Interrupted => continue,
|
|
Err(_) => break,
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Clone, Copy)]
|
|
enum PipeStdinMode {
|
|
Piped,
|
|
Null,
|
|
}
|
|
|
|
async fn spawn_process_with_stdin_mode(
|
|
program: &str,
|
|
args: &[String],
|
|
cwd: &Path,
|
|
env: &HashMap<String, String>,
|
|
arg0: &Option<String>,
|
|
stdin_mode: PipeStdinMode,
|
|
inherited_fds: &[i32],
|
|
) -> Result<SpawnedProcess> {
|
|
if program.is_empty() {
|
|
anyhow::bail!("missing program for pipe spawn");
|
|
}
|
|
|
|
#[cfg(not(unix))]
|
|
let _ = inherited_fds;
|
|
|
|
let mut command = Command::new(program);
|
|
#[cfg(unix)]
|
|
if let Some(arg0) = arg0 {
|
|
command.arg0(arg0);
|
|
}
|
|
#[cfg(target_os = "linux")]
|
|
let parent_pid = unsafe { libc::getpid() };
|
|
#[cfg(unix)]
|
|
let inherited_fds = inherited_fds.to_vec();
|
|
#[cfg(unix)]
|
|
unsafe {
|
|
command.pre_exec(move || {
|
|
crate::process_group::detach_from_tty()?;
|
|
#[cfg(target_os = "linux")]
|
|
crate::process_group::set_parent_death_signal(parent_pid)?;
|
|
crate::pty::close_inherited_fds_except(&inherited_fds);
|
|
Ok(())
|
|
});
|
|
}
|
|
#[cfg(not(unix))]
|
|
let _ = arg0;
|
|
command.current_dir(cwd);
|
|
command.env_clear();
|
|
for (key, value) in env {
|
|
command.env(key, value);
|
|
}
|
|
for arg in args {
|
|
command.arg(arg);
|
|
}
|
|
match stdin_mode {
|
|
PipeStdinMode::Piped => {
|
|
command.stdin(Stdio::piped());
|
|
}
|
|
PipeStdinMode::Null => {
|
|
command.stdin(Stdio::null());
|
|
}
|
|
}
|
|
command.stdout(Stdio::piped());
|
|
command.stderr(Stdio::piped());
|
|
|
|
let mut child = command.spawn()?;
|
|
let pid = child
|
|
.id()
|
|
.ok_or_else(|| io::Error::other("missing child pid"))?;
|
|
#[cfg(unix)]
|
|
let process_group_id = pid;
|
|
|
|
let stdin = child.stdin.take();
|
|
let stdout = child.stdout.take();
|
|
let stderr = child.stderr.take();
|
|
|
|
let (writer_tx, mut writer_rx) = mpsc::channel::<Vec<u8>>(128);
|
|
let (stdout_tx, stdout_rx) = mpsc::channel::<Vec<u8>>(128);
|
|
let (stderr_tx, stderr_rx) = mpsc::channel::<Vec<u8>>(128);
|
|
let writer_handle = if let Some(stdin) = stdin {
|
|
let writer = Arc::new(tokio::sync::Mutex::new(stdin));
|
|
tokio::spawn(async move {
|
|
while let Some(bytes) = writer_rx.recv().await {
|
|
let mut guard = writer.lock().await;
|
|
let _ = guard.write_all(&bytes).await;
|
|
let _ = guard.flush().await;
|
|
}
|
|
})
|
|
} else {
|
|
drop(writer_rx);
|
|
tokio::spawn(async {})
|
|
};
|
|
|
|
let stdout_handle = stdout.map(|stdout| {
|
|
let stdout_tx = stdout_tx.clone();
|
|
tokio::spawn(async move {
|
|
read_output_stream(BufReader::new(stdout), stdout_tx).await;
|
|
})
|
|
});
|
|
let stderr_handle = stderr.map(|stderr| {
|
|
let stderr_tx = stderr_tx.clone();
|
|
tokio::spawn(async move {
|
|
read_output_stream(BufReader::new(stderr), stderr_tx).await;
|
|
})
|
|
});
|
|
let mut reader_abort_handles = Vec::new();
|
|
if let Some(handle) = stdout_handle.as_ref() {
|
|
reader_abort_handles.push(handle.abort_handle());
|
|
}
|
|
if let Some(handle) = stderr_handle.as_ref() {
|
|
reader_abort_handles.push(handle.abort_handle());
|
|
}
|
|
let reader_handle = tokio::spawn(async move {
|
|
if let Some(handle) = stdout_handle {
|
|
let _ = handle.await;
|
|
}
|
|
if let Some(handle) = stderr_handle {
|
|
let _ = handle.await;
|
|
}
|
|
});
|
|
|
|
let (exit_tx, exit_rx) = oneshot::channel::<i32>();
|
|
let exit_status = Arc::new(AtomicBool::new(false));
|
|
let wait_exit_status = Arc::clone(&exit_status);
|
|
let exit_code = Arc::new(StdMutex::new(None));
|
|
let wait_exit_code = Arc::clone(&exit_code);
|
|
let wait_handle: JoinHandle<()> = tokio::spawn(async move {
|
|
let code = match child.wait().await {
|
|
Ok(status) => status.code().unwrap_or(-1),
|
|
Err(_) => -1,
|
|
};
|
|
wait_exit_status.store(true, std::sync::atomic::Ordering::SeqCst);
|
|
if let Ok(mut guard) = wait_exit_code.lock() {
|
|
*guard = Some(code);
|
|
}
|
|
let _ = exit_tx.send(code);
|
|
});
|
|
|
|
let handle = ProcessHandle::new(
|
|
writer_tx,
|
|
Box::new(PipeChildTerminator {
|
|
#[cfg(windows)]
|
|
pid,
|
|
#[cfg(unix)]
|
|
process_group_id,
|
|
}),
|
|
reader_handle,
|
|
reader_abort_handles,
|
|
writer_handle,
|
|
wait_handle,
|
|
exit_status,
|
|
exit_code,
|
|
None,
|
|
);
|
|
|
|
Ok(SpawnedProcess {
|
|
session: handle,
|
|
stdout_rx,
|
|
stderr_rx,
|
|
exit_rx,
|
|
})
|
|
}
|
|
|
|
/// Spawn a process using regular pipes (no PTY), returning handles for stdin, split output, and exit.
|
|
pub async fn spawn_process(
|
|
program: &str,
|
|
args: &[String],
|
|
cwd: &Path,
|
|
env: &HashMap<String, String>,
|
|
arg0: &Option<String>,
|
|
) -> Result<SpawnedProcess> {
|
|
spawn_process_with_stdin_mode(program, args, cwd, env, arg0, PipeStdinMode::Piped, &[]).await
|
|
}
|
|
|
|
/// Spawn a process using regular pipes, but close stdin immediately.
|
|
pub async fn spawn_process_no_stdin(
|
|
program: &str,
|
|
args: &[String],
|
|
cwd: &Path,
|
|
env: &HashMap<String, String>,
|
|
arg0: &Option<String>,
|
|
) -> Result<SpawnedProcess> {
|
|
spawn_process_no_stdin_with_inherited_fds(program, args, cwd, env, arg0, &[]).await
|
|
}
|
|
|
|
/// Spawn a process using regular pipes, close stdin immediately, and preserve
|
|
/// selected inherited file descriptors across exec on Unix.
|
|
pub async fn spawn_process_no_stdin_with_inherited_fds(
|
|
program: &str,
|
|
args: &[String],
|
|
cwd: &Path,
|
|
env: &HashMap<String, String>,
|
|
arg0: &Option<String>,
|
|
inherited_fds: &[i32],
|
|
) -> Result<SpawnedProcess> {
|
|
spawn_process_with_stdin_mode(
|
|
program,
|
|
args,
|
|
cwd,
|
|
env,
|
|
arg0,
|
|
PipeStdinMode::Null,
|
|
inherited_fds,
|
|
)
|
|
.await
|
|
}
|