mirror of
https://github.com/openai/codex.git
synced 2026-03-05 21:45:28 +03:00
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`
76 lines
2.7 KiB
Plaintext
Executable File
76 lines
2.7 KiB
Plaintext
Executable File
#!/usr/bin/env dotslash
|
|
|
|
// This is an instance of the fork of Bash that we bundle with
|
|
// https://www.npmjs.com/package/@openai/codex-shell-tool-mcp.
|
|
// Fetching the prebuilt version via DotSlash makes it easier to write
|
|
// integration tests for shell execution flows.
|
|
//
|
|
// TODO(mbolin): Currently, we use a .tgz artifact that includes binaries for
|
|
// multiple platforms, but we could save a bit of space by making arch-specific
|
|
// artifacts available in the GitHub releases and referencing those here.
|
|
{
|
|
"name": "codex-bash",
|
|
"platforms": {
|
|
// macOS 13 builds (and therefore x86_64) were dropped in
|
|
// https://github.com/openai/codex/pull/7295, so we only provide an
|
|
// Apple Silicon build for now.
|
|
"macos-aarch64": {
|
|
"size": 37003612,
|
|
"hash": "blake3",
|
|
"digest": "d9cd5928c993b65c340507931c61c02bd6e9179933f8bf26a548482bb5fa53bb",
|
|
"format": "tar.gz",
|
|
"path": "package/vendor/aarch64-apple-darwin/bash/macos-15/bash",
|
|
"providers": [
|
|
{
|
|
"url": "https://github.com/openai/codex/releases/download/rust-v0.65.0/codex-shell-tool-mcp-npm-0.65.0.tgz"
|
|
},
|
|
{
|
|
"type": "github-release",
|
|
"repo": "openai/codex",
|
|
"tag": "rust-v0.65.0",
|
|
"name": "codex-shell-tool-mcp-npm-0.65.0.tgz"
|
|
}
|
|
]
|
|
},
|
|
// Note the `musl` parts of the Linux paths are misleading: the Bash
|
|
// binaries are actually linked against `glibc`, but the
|
|
// `codex-execve-wrapper` that invokes them is linked against `musl`.
|
|
"linux-x86_64": {
|
|
"size": 37003612,
|
|
"hash": "blake3",
|
|
"digest": "d9cd5928c993b65c340507931c61c02bd6e9179933f8bf26a548482bb5fa53bb",
|
|
"format": "tar.gz",
|
|
"path": "package/vendor/x86_64-unknown-linux-musl/bash/ubuntu-24.04/bash",
|
|
"providers": [
|
|
{
|
|
"url": "https://github.com/openai/codex/releases/download/rust-v0.65.0/codex-shell-tool-mcp-npm-0.65.0.tgz"
|
|
},
|
|
{
|
|
"type": "github-release",
|
|
"repo": "openai/codex",
|
|
"tag": "rust-v0.65.0",
|
|
"name": "codex-shell-tool-mcp-npm-0.65.0.tgz"
|
|
}
|
|
]
|
|
},
|
|
"linux-aarch64": {
|
|
"size": 37003612,
|
|
"hash": "blake3",
|
|
"digest": "d9cd5928c993b65c340507931c61c02bd6e9179933f8bf26a548482bb5fa53bb",
|
|
"format": "tar.gz",
|
|
"path": "package/vendor/aarch64-unknown-linux-musl/bash/ubuntu-24.04/bash",
|
|
"providers": [
|
|
{
|
|
"url": "https://github.com/openai/codex/releases/download/rust-v0.65.0/codex-shell-tool-mcp-npm-0.65.0.tgz"
|
|
},
|
|
{
|
|
"type": "github-release",
|
|
"repo": "openai/codex",
|
|
"tag": "rust-v0.65.0",
|
|
"name": "codex-shell-tool-mcp-npm-0.65.0.tgz"
|
|
}
|
|
]
|
|
},
|
|
}
|
|
}
|