2025-07-22 13:33:49 -07:00
|
|
|
#![cfg(unix)]
|
fix: separate `codex mcp` into `codex mcp-server` and `codex app-server` (#4471)
This is a very large PR with some non-backwards-compatible changes.
Historically, `codex mcp` (or `codex mcp serve`) started a JSON-RPC-ish
server that had two overlapping responsibilities:
- Running an MCP server, providing some basic tool calls.
- Running the app server used to power experiences such as the VS Code
extension.
This PR aims to separate these into distinct concepts:
- `codex mcp-server` for the MCP server
- `codex app-server` for the "application server"
Note `codex mcp` still exists because it already has its own subcommands
for MCP management (`list`, `add`, etc.)
The MCP logic continues to live in `codex-rs/mcp-server` whereas the
refactored app server logic is in the new `codex-rs/app-server` folder.
Note that most of the existing integration tests in
`codex-rs/mcp-server/tests/suite` were actually for the app server, so
all the tests have been moved with the exception of
`codex-rs/mcp-server/tests/suite/mod.rs`.
Because this is already a large diff, I tried not to change more than I
had to, so `codex-rs/app-server/tests/common/mcp_process.rs` still uses
the name `McpProcess` for now, but I will do some mechanical renamings
to things like `AppServer` in subsequent PRs.
While `mcp-server` and `app-server` share some overlapping functionality
(like reading streams of JSONL and dispatching based on message types)
and some differences (completely different message types), I ended up
doing a bit of copypasta between the two crates, as both have somewhat
similar `message_processor.rs` and `outgoing_message.rs` files for now,
though I expect them to diverge more in the near future.
One material change is that of the initialize handshake for `codex
app-server`, as we no longer use the MCP types for that handshake.
Instead, we update `codex-rs/protocol/src/mcp_protocol.rs` to add an
`Initialize` variant to `ClientRequest`, which takes the `ClientInfo`
object we need to update the `USER_AGENT_SUFFIX` in
`codex-rs/app-server/src/message_processor.rs`.
One other material change is in
`codex-rs/app-server/src/codex_message_processor.rs` where I eliminated
a use of the `send_event_as_notification()` method I am generally trying
to deprecate (because it blindly maps an `EventMsg` into a
`JSONNotification`) in favor of `send_server_notification()`, which
takes a `ServerNotification`, as that is intended to be a custom enum of
all notification types supported by the app server. So to make this
update, I had to introduce a new variant of `ServerNotification`,
`SessionConfigured`, which is a non-backwards compatible change with the
old `codex mcp`, and clients will have to be updated after the next
release that contains this PR. Note that
`codex-rs/app-server/tests/suite/list_resume.rs` also had to be update
to reflect this change.
I introduced `codex-rs/utils/json-to-toml/src/lib.rs` as a small utility
crate to avoid some of the copying between `mcp-server` and
`app-server`.
2025-09-30 00:06:18 -07:00
|
|
|
// Support code lives in the `app_test_support` crate under tests/common.
|
2025-07-22 13:33:49 -07:00
|
|
|
|
|
|
|
|
use std::path::Path;
|
|
|
|
|
|
fix: remove mcp-types from app server protocol (#4537)
We continue the separation between `codex app-server` and `codex
mcp-server`.
In particular, we introduce a new crate, `codex-app-server-protocol`,
and migrate `codex-rs/protocol/src/mcp_protocol.rs` into it, renaming it
`codex-rs/app-server-protocol/src/protocol.rs`.
Because `ConversationId` was defined in `mcp_protocol.rs`, we move it
into its own file, `codex-rs/protocol/src/conversation_id.rs`, and
because it is referenced in a ton of places, we have to touch a lot of
files as part of this PR.
We also decide to get away from proper JSON-RPC 2.0 semantics, so we
also introduce `codex-rs/app-server-protocol/src/jsonrpc_lite.rs`, which
is basically the same `JSONRPCMessage` type defined in `mcp-types`
except with all of the `"jsonrpc": "2.0"` removed.
Getting rid of `"jsonrpc": "2.0"` makes our serialization logic
considerably simpler, as we can lean heavier on serde to serialize
directly into the wire format that we use now.
2025-09-30 19:16:26 -07:00
|
|
|
use codex_app_server_protocol::AddConversationListenerParams;
|
|
|
|
|
use codex_app_server_protocol::InterruptConversationParams;
|
|
|
|
|
use codex_app_server_protocol::InterruptConversationResponse;
|
|
|
|
|
use codex_app_server_protocol::JSONRPCResponse;
|
|
|
|
|
use codex_app_server_protocol::NewConversationParams;
|
|
|
|
|
use codex_app_server_protocol::NewConversationResponse;
|
|
|
|
|
use codex_app_server_protocol::RequestId;
|
|
|
|
|
use codex_app_server_protocol::SendUserMessageParams;
|
|
|
|
|
use codex_app_server_protocol::SendUserMessageResponse;
|
2025-08-18 00:29:18 -07:00
|
|
|
use codex_core::protocol::TurnAbortReason;
|
2025-09-25 13:11:14 -07:00
|
|
|
use core_test_support::skip_if_no_network;
|
2025-07-22 13:33:49 -07:00
|
|
|
use tempfile::TempDir;
|
|
|
|
|
use tokio::time::timeout;
|
|
|
|
|
|
fix: separate `codex mcp` into `codex mcp-server` and `codex app-server` (#4471)
This is a very large PR with some non-backwards-compatible changes.
Historically, `codex mcp` (or `codex mcp serve`) started a JSON-RPC-ish
server that had two overlapping responsibilities:
- Running an MCP server, providing some basic tool calls.
- Running the app server used to power experiences such as the VS Code
extension.
This PR aims to separate these into distinct concepts:
- `codex mcp-server` for the MCP server
- `codex app-server` for the "application server"
Note `codex mcp` still exists because it already has its own subcommands
for MCP management (`list`, `add`, etc.)
The MCP logic continues to live in `codex-rs/mcp-server` whereas the
refactored app server logic is in the new `codex-rs/app-server` folder.
Note that most of the existing integration tests in
`codex-rs/mcp-server/tests/suite` were actually for the app server, so
all the tests have been moved with the exception of
`codex-rs/mcp-server/tests/suite/mod.rs`.
Because this is already a large diff, I tried not to change more than I
had to, so `codex-rs/app-server/tests/common/mcp_process.rs` still uses
the name `McpProcess` for now, but I will do some mechanical renamings
to things like `AppServer` in subsequent PRs.
While `mcp-server` and `app-server` share some overlapping functionality
(like reading streams of JSONL and dispatching based on message types)
and some differences (completely different message types), I ended up
doing a bit of copypasta between the two crates, as both have somewhat
similar `message_processor.rs` and `outgoing_message.rs` files for now,
though I expect them to diverge more in the near future.
One material change is that of the initialize handshake for `codex
app-server`, as we no longer use the MCP types for that handshake.
Instead, we update `codex-rs/protocol/src/mcp_protocol.rs` to add an
`Initialize` variant to `ClientRequest`, which takes the `ClientInfo`
object we need to update the `USER_AGENT_SUFFIX` in
`codex-rs/app-server/src/message_processor.rs`.
One other material change is in
`codex-rs/app-server/src/codex_message_processor.rs` where I eliminated
a use of the `send_event_as_notification()` method I am generally trying
to deprecate (because it blindly maps an `EventMsg` into a
`JSONNotification`) in favor of `send_server_notification()`, which
takes a `ServerNotification`, as that is intended to be a custom enum of
all notification types supported by the app server. So to make this
update, I had to introduce a new variant of `ServerNotification`,
`SessionConfigured`, which is a non-backwards compatible change with the
old `codex mcp`, and clients will have to be updated after the next
release that contains this PR. Note that
`codex-rs/app-server/tests/suite/list_resume.rs` also had to be update
to reflect this change.
I introduced `codex-rs/utils/json-to-toml/src/lib.rs` as a small utility
crate to avoid some of the copying between `mcp-server` and
`app-server`.
2025-09-30 00:06:18 -07:00
|
|
|
use app_test_support::McpProcess;
|
|
|
|
|
use app_test_support::create_mock_chat_completions_server;
|
|
|
|
|
use app_test_support::create_shell_sse_response;
|
|
|
|
|
use app_test_support::to_response;
|
2025-07-22 13:33:49 -07:00
|
|
|
|
|
|
|
|
const DEFAULT_READ_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(10);
|
|
|
|
|
|
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
|
|
|
async fn test_shell_command_interruption() {
|
2025-09-25 13:11:14 -07:00
|
|
|
skip_if_no_network!();
|
2025-07-22 13:33:49 -07:00
|
|
|
|
|
|
|
|
if let Err(err) = shell_command_interruption().await {
|
|
|
|
|
panic!("failure: {err}");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
async fn shell_command_interruption() -> anyhow::Result<()> {
|
|
|
|
|
// Use a cross-platform blocking command. On Windows plain `sleep` is not guaranteed to exist
|
|
|
|
|
// (MSYS/GNU coreutils may be absent) and the failure causes the tool call to finish immediately,
|
|
|
|
|
// which triggers a second model request before the test sends the explicit follow-up. That
|
|
|
|
|
// prematurely consumes the second mocked SSE response and leads to a third POST (panic: no response for 2).
|
|
|
|
|
// Powershell Start-Sleep is always available on Windows runners. On Unix we keep using `sleep`.
|
|
|
|
|
#[cfg(target_os = "windows")]
|
|
|
|
|
let shell_command = vec![
|
|
|
|
|
"powershell".to_string(),
|
|
|
|
|
"-Command".to_string(),
|
2025-08-18 00:29:18 -07:00
|
|
|
"Start-Sleep -Seconds 10".to_string(),
|
2025-07-22 13:33:49 -07:00
|
|
|
];
|
|
|
|
|
#[cfg(not(target_os = "windows"))]
|
2025-08-18 00:29:18 -07:00
|
|
|
let shell_command = vec!["sleep".to_string(), "10".to_string()];
|
|
|
|
|
|
|
|
|
|
let tmp = TempDir::new()?;
|
|
|
|
|
// Temporary Codex home with config pointing at the mock server.
|
|
|
|
|
let codex_home = tmp.path().join("codex_home");
|
|
|
|
|
std::fs::create_dir(&codex_home)?;
|
|
|
|
|
let working_directory = tmp.path().join("workdir");
|
|
|
|
|
std::fs::create_dir(&working_directory)?;
|
2025-07-22 13:33:49 -07:00
|
|
|
|
|
|
|
|
// Create mock server with a single SSE response: the long sleep command
|
2025-08-18 00:29:18 -07:00
|
|
|
let server = create_mock_chat_completions_server(vec![create_shell_sse_response(
|
|
|
|
|
shell_command.clone(),
|
|
|
|
|
Some(&working_directory),
|
|
|
|
|
Some(10_000), // 10 seconds timeout in ms
|
|
|
|
|
"call_sleep",
|
|
|
|
|
)?])
|
2025-07-22 13:33:49 -07:00
|
|
|
.await;
|
2025-08-18 00:29:18 -07:00
|
|
|
create_config_toml(&codex_home, server.uri())?;
|
2025-07-22 13:33:49 -07:00
|
|
|
|
2025-08-18 00:29:18 -07:00
|
|
|
// Start MCP server and initialize.
|
|
|
|
|
let mut mcp = McpProcess::new(&codex_home).await?;
|
|
|
|
|
timeout(DEFAULT_READ_TIMEOUT, mcp.initialize()).await??;
|
2025-07-22 13:33:49 -07:00
|
|
|
|
2025-08-18 00:29:18 -07:00
|
|
|
// 1) newConversation
|
|
|
|
|
let new_conv_id = mcp
|
|
|
|
|
.send_new_conversation_request(NewConversationParams {
|
|
|
|
|
cwd: Some(working_directory.to_string_lossy().into_owned()),
|
|
|
|
|
..Default::default()
|
|
|
|
|
})
|
2025-07-22 13:33:49 -07:00
|
|
|
.await?;
|
2025-08-18 00:29:18 -07:00
|
|
|
let new_conv_resp: JSONRPCResponse = timeout(
|
|
|
|
|
DEFAULT_READ_TIMEOUT,
|
|
|
|
|
mcp.read_stream_until_response_message(RequestId::Integer(new_conv_id)),
|
|
|
|
|
)
|
|
|
|
|
.await??;
|
|
|
|
|
let new_conv_resp = to_response::<NewConversationResponse>(new_conv_resp)?;
|
|
|
|
|
let NewConversationResponse {
|
|
|
|
|
conversation_id, ..
|
|
|
|
|
} = new_conv_resp;
|
|
|
|
|
|
|
|
|
|
// 2) addConversationListener
|
|
|
|
|
let add_listener_id = mcp
|
2025-10-24 15:41:52 -07:00
|
|
|
.send_add_conversation_listener_request(AddConversationListenerParams {
|
|
|
|
|
conversation_id,
|
|
|
|
|
experimental_raw_events: false,
|
|
|
|
|
})
|
2025-07-22 13:33:49 -07:00
|
|
|
.await?;
|
2025-08-18 00:29:18 -07:00
|
|
|
let _add_listener_resp: JSONRPCResponse = timeout(
|
2025-07-22 13:33:49 -07:00
|
|
|
DEFAULT_READ_TIMEOUT,
|
2025-08-18 00:29:18 -07:00
|
|
|
mcp.read_stream_until_response_message(RequestId::Integer(add_listener_id)),
|
2025-07-22 13:33:49 -07:00
|
|
|
)
|
|
|
|
|
.await??;
|
|
|
|
|
|
2025-08-18 00:29:18 -07:00
|
|
|
// 3) sendUserMessage (should trigger notifications; we only validate an OK response)
|
|
|
|
|
let send_user_id = mcp
|
|
|
|
|
.send_send_user_message_request(SendUserMessageParams {
|
|
|
|
|
conversation_id,
|
fix: remove mcp-types from app server protocol (#4537)
We continue the separation between `codex app-server` and `codex
mcp-server`.
In particular, we introduce a new crate, `codex-app-server-protocol`,
and migrate `codex-rs/protocol/src/mcp_protocol.rs` into it, renaming it
`codex-rs/app-server-protocol/src/protocol.rs`.
Because `ConversationId` was defined in `mcp_protocol.rs`, we move it
into its own file, `codex-rs/protocol/src/conversation_id.rs`, and
because it is referenced in a ton of places, we have to touch a lot of
files as part of this PR.
We also decide to get away from proper JSON-RPC 2.0 semantics, so we
also introduce `codex-rs/app-server-protocol/src/jsonrpc_lite.rs`, which
is basically the same `JSONRPCMessage` type defined in `mcp-types`
except with all of the `"jsonrpc": "2.0"` removed.
Getting rid of `"jsonrpc": "2.0"` makes our serialization logic
considerably simpler, as we can lean heavier on serde to serialize
directly into the wire format that we use now.
2025-09-30 19:16:26 -07:00
|
|
|
items: vec![codex_app_server_protocol::InputItem::Text {
|
2025-08-18 00:29:18 -07:00
|
|
|
text: "run first sleep command".to_string(),
|
|
|
|
|
}],
|
|
|
|
|
})
|
2025-07-22 13:33:49 -07:00
|
|
|
.await?;
|
2025-08-18 00:29:18 -07:00
|
|
|
let send_user_resp: JSONRPCResponse = timeout(
|
|
|
|
|
DEFAULT_READ_TIMEOUT,
|
|
|
|
|
mcp.read_stream_until_response_message(RequestId::Integer(send_user_id)),
|
|
|
|
|
)
|
|
|
|
|
.await??;
|
|
|
|
|
let SendUserMessageResponse {} = to_response::<SendUserMessageResponse>(send_user_resp)?;
|
2025-07-22 13:33:49 -07:00
|
|
|
|
|
|
|
|
// Give the command a moment to start
|
|
|
|
|
tokio::time::sleep(std::time::Duration::from_secs(1)).await;
|
|
|
|
|
|
2025-08-18 00:29:18 -07:00
|
|
|
// 4) send interrupt request
|
|
|
|
|
let interrupt_id = mcp
|
|
|
|
|
.send_interrupt_conversation_request(InterruptConversationParams { conversation_id })
|
2025-07-22 13:33:49 -07:00
|
|
|
.await?;
|
2025-08-18 00:29:18 -07:00
|
|
|
let interrupt_resp: JSONRPCResponse = timeout(
|
2025-07-22 13:33:49 -07:00
|
|
|
DEFAULT_READ_TIMEOUT,
|
2025-08-18 00:29:18 -07:00
|
|
|
mcp.read_stream_until_response_message(RequestId::Integer(interrupt_id)),
|
2025-07-22 13:33:49 -07:00
|
|
|
)
|
|
|
|
|
.await??;
|
2025-08-18 00:29:18 -07:00
|
|
|
let InterruptConversationResponse { abort_reason } =
|
|
|
|
|
to_response::<InterruptConversationResponse>(interrupt_resp)?;
|
|
|
|
|
assert_eq!(TurnAbortReason::Interrupted, abort_reason);
|
|
|
|
|
|
2025-07-22 13:33:49 -07:00
|
|
|
Ok(())
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// ---------------------------------------------------------------------------
|
|
|
|
|
// Helpers
|
|
|
|
|
// ---------------------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
fn create_config_toml(codex_home: &Path, server_uri: String) -> std::io::Result<()> {
|
|
|
|
|
let config_toml = codex_home.join("config.toml");
|
|
|
|
|
std::fs::write(
|
|
|
|
|
config_toml,
|
|
|
|
|
format!(
|
|
|
|
|
r#"
|
|
|
|
|
model = "mock-model"
|
|
|
|
|
approval_policy = "never"
|
2025-11-06 08:36:36 -08:00
|
|
|
sandbox_mode = "read-only"
|
2025-07-22 13:33:49 -07:00
|
|
|
|
|
|
|
|
model_provider = "mock_provider"
|
|
|
|
|
|
|
|
|
|
[model_providers.mock_provider]
|
|
|
|
|
name = "Mock provider for test"
|
|
|
|
|
base_url = "{server_uri}/v1"
|
|
|
|
|
wire_api = "chat"
|
|
|
|
|
request_max_retries = 0
|
|
|
|
|
stream_max_retries = 0
|
|
|
|
|
"#
|
|
|
|
|
),
|
|
|
|
|
)
|
|
|
|
|
}
|