38f84b6b29
## Why We already plan to remove the shell-tool MCP path, and doing that cleanup first makes the follow-on `shell-escalation` work much simpler. This change removes the last remaining reason to keep `codex-rs/exec-server` around by moving the `codex-execve-wrapper` binary and shared shell test fixtures to the crates/tests that now own that functionality. ## What Changed ### Delete `codex-rs/exec-server` - Remove the `exec-server` crate, including the MCP server binary, MCP-specific modules, and its test support/test suite - Remove `exec-server` from the `codex-rs` workspace and update `Cargo.lock` ### Move `codex-execve-wrapper` into `codex-rs/shell-escalation` - Move the wrapper implementation into `shell-escalation` (`src/unix/execve_wrapper.rs`) - Add the `codex-execve-wrapper` binary entrypoint under `shell-escalation/src/bin/` - Update `shell-escalation` exports/module layout so the wrapper entrypoint is hosted there - Move the wrapper README content from `exec-server` to `shell-escalation/README.md` ### Move shared shell test fixtures to `app-server` - Move the DotSlash `bash`/`zsh` test fixtures from `exec-server/tests/suite/` to `app-server/tests/suite/` - Update `app-server` zsh-fork tests to reference the new fixture paths ### Keep `shell-tool-mcp` as a shell-assets package - Update `.github/workflows/shell-tool-mcp.yml` packaging so the npm artifact contains only patched Bash/Zsh payloads (no Rust binaries) - Update `shell-tool-mcp/package.json`, `shell-tool-mcp/src/index.ts`, and docs to reflect the shell-assets-only package shape - `shell-tool-mcp-ci.yml` does not need changes because it is already JS-only ## Verification - `cargo shear` - `cargo clippy -p codex-shell-escalation --tests` - `just clippy`
28 lines
1.4 KiB
Markdown
28 lines
1.4 KiB
Markdown
# codex-shell-escalation
|
|
|
|
This crate contains the Unix shell-escalation protocol implementation and the
|
|
`codex-execve-wrapper` executable.
|
|
|
|
`codex-execve-wrapper` receives the arguments to an intercepted `execve(2)` call and delegates the
|
|
decision to the shell-escalation protocol over a shared file descriptor (specified by the
|
|
`CODEX_ESCALATE_SOCKET` environment variable). The server on the other side replies with one of:
|
|
|
|
- `Run`: `codex-execve-wrapper` should invoke `execve(2)` on itself to run the original command
|
|
within the sandboxed shell.
|
|
- `Escalate`: forward the file descriptors of the current process so the command can be run
|
|
faithfully outside the sandbox. When the process completes, the server forwards the exit code
|
|
back to `codex-execve-wrapper`.
|
|
- `Deny`: the server has declared the proposed command to be forbidden, so
|
|
`codex-execve-wrapper` prints an error to `stderr` and exits with `1`.
|
|
|
|
## Patched Bash
|
|
|
|
We carry a small patch to `execute_cmd.c` (see `patches/bash-exec-wrapper.patch`) that adds support for `EXEC_WRAPPER`. The original commit message is “add support for BASH_EXEC_WRAPPER” and the patch applies cleanly to `a8a1c2fac029404d3f42cd39f5a20f24b6e4fe4b` from https://github.com/bminor/bash. To rebuild manually:
|
|
|
|
```bash
|
|
git clone https://github.com/bminor/bash
|
|
git checkout a8a1c2fac029404d3f42cd39f5a20f24b6e4fe4b
|
|
git apply /path/to/patches/bash-exec-wrapper.patch
|
|
./configure --without-bash-malloc
|
|
make -j"$(nproc)"
|
|
```
|