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`.
96 lines
2.5 KiB
Rust
96 lines
2.5 KiB
Rust
use serde_json::json;
|
|
use std::path::Path;
|
|
|
|
pub fn create_shell_sse_response(
|
|
command: Vec<String>,
|
|
workdir: Option<&Path>,
|
|
timeout_ms: Option<u64>,
|
|
call_id: &str,
|
|
) -> anyhow::Result<String> {
|
|
// The `arguments`` for the `shell` tool is a serialized JSON object.
|
|
let tool_call_arguments = serde_json::to_string(&json!({
|
|
"command": command,
|
|
"workdir": workdir.map(|w| w.to_string_lossy()),
|
|
"timeout": timeout_ms
|
|
}))?;
|
|
let tool_call = json!({
|
|
"choices": [
|
|
{
|
|
"delta": {
|
|
"tool_calls": [
|
|
{
|
|
"id": call_id,
|
|
"function": {
|
|
"name": "shell",
|
|
"arguments": tool_call_arguments
|
|
}
|
|
}
|
|
]
|
|
},
|
|
"finish_reason": "tool_calls"
|
|
}
|
|
]
|
|
});
|
|
|
|
let sse = format!(
|
|
"data: {}\n\ndata: DONE\n\n",
|
|
serde_json::to_string(&tool_call)?
|
|
);
|
|
Ok(sse)
|
|
}
|
|
|
|
pub fn create_final_assistant_message_sse_response(message: &str) -> anyhow::Result<String> {
|
|
let assistant_message = json!({
|
|
"choices": [
|
|
{
|
|
"delta": {
|
|
"content": message
|
|
},
|
|
"finish_reason": "stop"
|
|
}
|
|
]
|
|
});
|
|
|
|
let sse = format!(
|
|
"data: {}\n\ndata: DONE\n\n",
|
|
serde_json::to_string(&assistant_message)?
|
|
);
|
|
Ok(sse)
|
|
}
|
|
|
|
pub fn create_apply_patch_sse_response(
|
|
patch_content: &str,
|
|
call_id: &str,
|
|
) -> anyhow::Result<String> {
|
|
// Use shell command to call apply_patch with heredoc format
|
|
let shell_command = format!("apply_patch <<'EOF'\n{patch_content}\nEOF");
|
|
let tool_call_arguments = serde_json::to_string(&json!({
|
|
"command": ["bash", "-lc", shell_command]
|
|
}))?;
|
|
|
|
let tool_call = json!({
|
|
"choices": [
|
|
{
|
|
"delta": {
|
|
"tool_calls": [
|
|
{
|
|
"id": call_id,
|
|
"function": {
|
|
"name": "shell",
|
|
"arguments": tool_call_arguments
|
|
}
|
|
}
|
|
]
|
|
},
|
|
"finish_reason": "tool_calls"
|
|
}
|
|
]
|
|
});
|
|
|
|
let sse = format!(
|
|
"data: {}\n\ndata: DONE\n\n",
|
|
serde_json::to_string(&tool_call)?
|
|
);
|
|
Ok(sse)
|
|
}
|