fix: add test that verifies that codex-exec-mcp-server starts up

codex-rs/Cargo.lock

@@ -1253,6 +1253,7 @@ name = "codex-exec-server"
 version = "0.0.0"
 dependencies = [
  "anyhow",
+ "assert_cmd",
  "async-trait",
  "clap",
  "codex-core",

codex-rs/exec-server/Cargo.toml

@@ -1,8 +1,8 @@
 [package]
-name = "codex-exec-server"
-version.workspace = true
 edition.workspace = true
 license.workspace = true
+name = "codex-exec-server"
+version.workspace = true
 
 [[bin]]
 name = "codex-execve-wrapper"
@@ -56,5 +56,6 @@ tracing = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter", "fmt"] }
 
 [dev-dependencies]
+assert_cmd = { workspace = true }
 pretty_assertions = { workspace = true }
 tempfile = { workspace = true }

codex-rs/exec-server/tests/all.rs

@@ -0,0 +1,3 @@
+// Single integration test binary that aggregates all test modules.
+// The submodules live in `tests/suite/`.
+mod suite;

codex-rs/exec-server/tests/suite/auto_approve.rs

@@ -0,0 +1,88 @@
+use std::borrow::Cow;
+use std::path::Path;
+use std::process::Stdio;
+use std::sync::Arc;
+
+use anyhow::Result;
+use pretty_assertions::assert_eq;
+use rmcp::ServiceExt;
+use rmcp::model::Tool;
+use rmcp::model::object;
+use rmcp::transport::ConfigureCommandExt;
+use rmcp::transport::TokioChildProcess;
+use serde_json::json;
+use tokio::process::Command;
+
+#[tokio::test(flavor = "current_thread")]
+async fn auto_approve() -> Result<()> {
+    let mcp_executable = assert_cmd::Command::cargo_bin("codex-exec-mcp-server")?;
+    let execve_wrapper = assert_cmd::Command::cargo_bin("codex-execve-wrapper")?;
+    let bash = Path::new(env!("CARGO_MANIFEST_DIR"))
+        .join("tests")
+        .join("suite")
+        .join("bash");
+    let transport =
+        TokioChildProcess::new(Command::new(mcp_executable.get_program()).configure(|cmd| {
+            cmd.arg("--bash").arg(bash);
+            cmd.arg("--execve").arg(execve_wrapper.get_program());
+
+            // Important: pipe stdio so rmcp can speak JSON-RPC over stdin/stdout
+            cmd.stdin(Stdio::piped());
+            cmd.stdout(Stdio::piped());
+
+            // Optional but very helpful while debugging:
+            cmd.stderr(Stdio::inherit());
+        }))?;
+
+    let service = ().serve(transport).await?;
+    let tools = service.list_tools(Default::default()).await?.tools;
+    assert_eq!(
+        vec![Tool {
+            name: Cow::Borrowed("shell"),
+            title: None,
+            description: Some(Cow::Borrowed(
+                "Runs a shell command and returns its output. You MUST provide the workdir as an absolute path."
+            )),
+            input_schema: Arc::new(object(json!(        {
+                "$schema": "https://json-schema.org/draft/2020-12/schema",
+                "properties": {
+                    "command": {
+                        "description": "The bash string to execute.",
+                        "type": "string",
+                    },
+                    "login": {
+                        "description": "Launch Bash with -lc instead of -c: defaults to true.",
+                        "nullable": true,
+                        "type": "boolean",
+                    },
+                    "timeout_ms": {
+                        "description": "The timeout for the command in milliseconds.",
+                        "format": "uint64",
+                        "minimum": 0,
+                        "nullable": true,
+                        "type": "integer",
+                    },
+                    "workdir": {
+                        "description": "The working directory to execute the command in. Must be an absolute path.",
+                        "type": "string",
+                    },
+                },
+                "required": [
+                    "command",
+                    "workdir",
+                ],
+                "title": "ExecParams",
+                "type": "object",
+            }))),
+            output_schema: None,
+            annotations: None,
+            icons: None,
+            meta: None
+        }],
+        tools
+    );
+
+    // TODO(mbolin): Make shell tool calls and verify they work.
+
+    Ok(())
+}

codex-rs/exec-server/tests/suite/bash

@@ -0,0 +1,71 @@
+#!/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 the MCP server.
+{
+  "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"
+        }
+      ]
+    },
+  }
+}

codex-rs/exec-server/tests/suite/mod.rs

@@ -0,0 +1,2 @@
+#[cfg(any(all(target_os = "macos", target_arch = "aarch64"), target_os = "linux",))]
+mod auto_approve;