2025-10-28 08:10:23 -07:00
|
|
|
use anyhow::Result;
|
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_final_assistant_message_sse_response;
|
|
|
|
|
use app_test_support::create_mock_chat_completions_server;
|
|
|
|
|
use app_test_support::to_response;
|
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::AddConversationSubscriptionResponse;
|
|
|
|
|
use codex_app_server_protocol::InputItem;
|
|
|
|
|
use codex_app_server_protocol::JSONRPCNotification;
|
|
|
|
|
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;
|
|
|
|
|
use codex_protocol::ConversationId;
|
2025-10-24 15:41:52 -07:00
|
|
|
use codex_protocol::models::ContentItem;
|
|
|
|
|
use codex_protocol::models::ResponseItem;
|
2025-10-29 13:32:40 -07:00
|
|
|
use codex_protocol::protocol::RawResponseItemEvent;
|
2025-08-01 10:04:12 -07:00
|
|
|
use pretty_assertions::assert_eq;
|
2025-10-28 08:10:23 -07:00
|
|
|
use std::path::Path;
|
2025-08-01 10:04:12 -07:00
|
|
|
use tempfile::TempDir;
|
|
|
|
|
use tokio::time::timeout;
|
|
|
|
|
|
|
|
|
|
const DEFAULT_READ_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(10);
|
|
|
|
|
|
2025-08-06 00:07:58 -07:00
|
|
|
#[tokio::test]
|
2025-10-28 08:10:23 -07:00
|
|
|
async fn test_send_message_success() -> Result<()> {
|
2025-08-01 10:04:12 -07:00
|
|
|
// Spin up a mock completions server that immediately ends the Codex turn.
|
|
|
|
|
// Two Codex turns hit the mock model (session start + send-user-message). Provide two SSE responses.
|
|
|
|
|
let responses = vec![
|
2025-10-28 08:10:23 -07:00
|
|
|
create_final_assistant_message_sse_response("Done")?,
|
|
|
|
|
create_final_assistant_message_sse_response("Done")?,
|
2025-08-01 10:04:12 -07:00
|
|
|
];
|
|
|
|
|
let server = create_mock_chat_completions_server(responses).await;
|
|
|
|
|
|
|
|
|
|
// Create a temporary Codex home with config pointing at the mock server.
|
2025-10-28 08:10:23 -07:00
|
|
|
let codex_home = TempDir::new()?;
|
|
|
|
|
create_config_toml(codex_home.path(), &server.uri())?;
|
2025-08-01 10:04:12 -07:00
|
|
|
|
|
|
|
|
// Start MCP server process and initialize.
|
2025-10-28 08:10:23 -07:00
|
|
|
let mut mcp = McpProcess::new(codex_home.path()).await?;
|
|
|
|
|
timeout(DEFAULT_READ_TIMEOUT, mcp.initialize()).await??;
|
2025-08-01 10:04:12 -07:00
|
|
|
|
2025-08-18 00:29:18 -07:00
|
|
|
// Start a conversation using the new wire API.
|
|
|
|
|
let new_conv_id = mcp
|
2025-10-30 11:18:31 -07:00
|
|
|
.send_new_conversation_request(NewConversationParams {
|
|
|
|
|
..Default::default()
|
|
|
|
|
})
|
2025-10-28 08:10:23 -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)),
|
|
|
|
|
)
|
2025-10-28 08:10:23 -07:00
|
|
|
.await??;
|
2025-08-18 00:29:18 -07:00
|
|
|
let NewConversationResponse {
|
|
|
|
|
conversation_id, ..
|
2025-10-28 08:10:23 -07:00
|
|
|
} = to_response::<_>(new_conv_resp)?;
|
2025-08-18 00:29:18 -07:00
|
|
|
|
|
|
|
|
// 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-10-28 08:10:23 -07:00
|
|
|
.await?;
|
2025-08-18 00:29:18 -07:00
|
|
|
let add_listener_resp: JSONRPCResponse = timeout(
|
2025-08-01 10:04:12 -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-08-01 10:04:12 -07:00
|
|
|
)
|
2025-10-28 08:10:23 -07:00
|
|
|
.await??;
|
2025-08-18 00:29:18 -07:00
|
|
|
let AddConversationSubscriptionResponse { subscription_id: _ } =
|
2025-10-28 08:10:23 -07:00
|
|
|
to_response::<_>(add_listener_resp)?;
|
2025-08-18 00:29:18 -07:00
|
|
|
|
|
|
|
|
// Now exercise sendUserMessage twice.
|
2025-10-28 08:10:23 -07:00
|
|
|
send_message("Hello", conversation_id, &mut mcp).await?;
|
|
|
|
|
send_message("Hello again", conversation_id, &mut mcp).await?;
|
|
|
|
|
Ok(())
|
2025-08-18 00:29:18 -07:00
|
|
|
}
|
2025-08-01 10:04:12 -07:00
|
|
|
|
2025-08-18 00:29:18 -07:00
|
|
|
#[expect(clippy::expect_used)]
|
2025-10-28 08:10:23 -07:00
|
|
|
async fn send_message(
|
|
|
|
|
message: &str,
|
|
|
|
|
conversation_id: ConversationId,
|
|
|
|
|
mcp: &mut McpProcess,
|
|
|
|
|
) -> Result<()> {
|
2025-08-18 00:29:18 -07:00
|
|
|
// Now exercise sendUserMessage.
|
|
|
|
|
let send_id = mcp
|
|
|
|
|
.send_send_user_message_request(SendUserMessageParams {
|
|
|
|
|
conversation_id,
|
|
|
|
|
items: vec![InputItem::Text {
|
|
|
|
|
text: message.to_string(),
|
|
|
|
|
}],
|
|
|
|
|
})
|
2025-10-28 08:10:23 -07:00
|
|
|
.await?;
|
2025-08-01 10:04:12 -07:00
|
|
|
|
|
|
|
|
let response: JSONRPCResponse = timeout(
|
|
|
|
|
DEFAULT_READ_TIMEOUT,
|
2025-08-18 00:29:18 -07:00
|
|
|
mcp.read_stream_until_response_message(RequestId::Integer(send_id)),
|
2025-08-01 10:04:12 -07:00
|
|
|
)
|
2025-10-28 08:10:23 -07:00
|
|
|
.await??;
|
2025-08-18 00:29:18 -07:00
|
|
|
|
2025-10-28 08:10:23 -07:00
|
|
|
let _ok: SendUserMessageResponse = to_response::<SendUserMessageResponse>(response)?;
|
2025-08-01 10:04:12 -07:00
|
|
|
|
2025-08-18 00:29:18 -07:00
|
|
|
// Verify the task_finished notification is received.
|
|
|
|
|
// Note this also ensures that the final request to the server was made.
|
|
|
|
|
let task_finished_notification: JSONRPCNotification = timeout(
|
|
|
|
|
DEFAULT_READ_TIMEOUT,
|
|
|
|
|
mcp.read_stream_until_notification_message("codex/event/task_complete"),
|
|
|
|
|
)
|
2025-10-28 08:10:23 -07:00
|
|
|
.await??;
|
2025-08-18 00:29:18 -07:00
|
|
|
let serde_json::Value::Object(map) = task_finished_notification
|
|
|
|
|
.params
|
|
|
|
|
.expect("notification should have params")
|
|
|
|
|
else {
|
|
|
|
|
panic!("task_finished_notification should have params");
|
|
|
|
|
};
|
2025-08-01 10:04:12 -07:00
|
|
|
assert_eq!(
|
2025-08-18 00:29:18 -07:00
|
|
|
map.get("conversationId")
|
|
|
|
|
.expect("should have conversationId"),
|
|
|
|
|
&serde_json::Value::String(conversation_id.to_string())
|
2025-08-01 10:04:12 -07:00
|
|
|
);
|
2025-10-24 15:41:52 -07:00
|
|
|
|
|
|
|
|
let raw_attempt = tokio::time::timeout(
|
|
|
|
|
std::time::Duration::from_millis(200),
|
|
|
|
|
mcp.read_stream_until_notification_message("codex/event/raw_response_item"),
|
|
|
|
|
)
|
|
|
|
|
.await;
|
|
|
|
|
assert!(
|
|
|
|
|
raw_attempt.is_err(),
|
|
|
|
|
"unexpected raw item notification when not opted in"
|
|
|
|
|
);
|
2025-10-28 08:10:23 -07:00
|
|
|
Ok(())
|
2025-10-24 15:41:52 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[tokio::test]
|
2025-10-28 08:10:23 -07:00
|
|
|
async fn test_send_message_raw_notifications_opt_in() -> Result<()> {
|
|
|
|
|
let responses = vec![create_final_assistant_message_sse_response("Done")?];
|
2025-10-24 15:41:52 -07:00
|
|
|
let server = create_mock_chat_completions_server(responses).await;
|
|
|
|
|
|
2025-10-28 08:10:23 -07:00
|
|
|
let codex_home = TempDir::new()?;
|
|
|
|
|
create_config_toml(codex_home.path(), &server.uri())?;
|
2025-10-24 15:41:52 -07:00
|
|
|
|
2025-10-28 08:10:23 -07:00
|
|
|
let mut mcp = McpProcess::new(codex_home.path()).await?;
|
|
|
|
|
timeout(DEFAULT_READ_TIMEOUT, mcp.initialize()).await??;
|
2025-10-24 15:41:52 -07:00
|
|
|
|
|
|
|
|
let new_conv_id = mcp
|
2025-10-30 11:18:31 -07:00
|
|
|
.send_new_conversation_request(NewConversationParams {
|
|
|
|
|
developer_instructions: Some("Use the test harness tools.".to_string()),
|
|
|
|
|
..Default::default()
|
|
|
|
|
})
|
2025-10-28 08:10:23 -07:00
|
|
|
.await?;
|
2025-10-24 15:41:52 -07:00
|
|
|
let new_conv_resp: JSONRPCResponse = timeout(
|
|
|
|
|
DEFAULT_READ_TIMEOUT,
|
|
|
|
|
mcp.read_stream_until_response_message(RequestId::Integer(new_conv_id)),
|
|
|
|
|
)
|
2025-10-28 08:10:23 -07:00
|
|
|
.await??;
|
2025-10-24 15:41:52 -07:00
|
|
|
let NewConversationResponse {
|
|
|
|
|
conversation_id, ..
|
2025-10-28 08:10:23 -07:00
|
|
|
} = to_response::<_>(new_conv_resp)?;
|
2025-10-24 15:41:52 -07:00
|
|
|
|
|
|
|
|
let add_listener_id = mcp
|
|
|
|
|
.send_add_conversation_listener_request(AddConversationListenerParams {
|
|
|
|
|
conversation_id,
|
|
|
|
|
experimental_raw_events: true,
|
|
|
|
|
})
|
2025-10-28 08:10:23 -07:00
|
|
|
.await?;
|
2025-10-24 15:41:52 -07:00
|
|
|
let add_listener_resp: JSONRPCResponse = timeout(
|
|
|
|
|
DEFAULT_READ_TIMEOUT,
|
|
|
|
|
mcp.read_stream_until_response_message(RequestId::Integer(add_listener_id)),
|
|
|
|
|
)
|
2025-10-28 08:10:23 -07:00
|
|
|
.await??;
|
2025-10-24 15:41:52 -07:00
|
|
|
let AddConversationSubscriptionResponse { subscription_id: _ } =
|
2025-10-28 08:10:23 -07:00
|
|
|
to_response::<_>(add_listener_resp)?;
|
2025-10-24 15:41:52 -07:00
|
|
|
|
|
|
|
|
let send_id = mcp
|
|
|
|
|
.send_send_user_message_request(SendUserMessageParams {
|
|
|
|
|
conversation_id,
|
|
|
|
|
items: vec![InputItem::Text {
|
|
|
|
|
text: "Hello".to_string(),
|
|
|
|
|
}],
|
|
|
|
|
})
|
2025-10-28 08:10:23 -07:00
|
|
|
.await?;
|
2025-10-24 15:41:52 -07:00
|
|
|
|
2025-10-30 11:18:31 -07:00
|
|
|
let developer = read_raw_response_item(&mut mcp, conversation_id).await;
|
|
|
|
|
assert_developer_message(&developer, "Use the test harness tools.");
|
|
|
|
|
|
2025-10-24 15:41:52 -07:00
|
|
|
let instructions = read_raw_response_item(&mut mcp, conversation_id).await;
|
|
|
|
|
assert_instructions_message(&instructions);
|
|
|
|
|
|
|
|
|
|
let environment = read_raw_response_item(&mut mcp, conversation_id).await;
|
|
|
|
|
assert_environment_message(&environment);
|
|
|
|
|
|
|
|
|
|
let response: JSONRPCResponse = timeout(
|
|
|
|
|
DEFAULT_READ_TIMEOUT,
|
|
|
|
|
mcp.read_stream_until_response_message(RequestId::Integer(send_id)),
|
|
|
|
|
)
|
2025-10-28 08:10:23 -07:00
|
|
|
.await??;
|
|
|
|
|
let _ok: SendUserMessageResponse = to_response::<SendUserMessageResponse>(response)?;
|
2025-10-24 15:41:52 -07:00
|
|
|
|
|
|
|
|
let user_message = read_raw_response_item(&mut mcp, conversation_id).await;
|
|
|
|
|
assert_user_message(&user_message, "Hello");
|
|
|
|
|
|
|
|
|
|
let assistant_message = read_raw_response_item(&mut mcp, conversation_id).await;
|
|
|
|
|
assert_assistant_message(&assistant_message, "Done");
|
|
|
|
|
|
|
|
|
|
let _ = tokio::time::timeout(
|
|
|
|
|
std::time::Duration::from_millis(250),
|
|
|
|
|
mcp.read_stream_until_notification_message("codex/event/task_complete"),
|
|
|
|
|
)
|
|
|
|
|
.await;
|
2025-10-28 08:10:23 -07:00
|
|
|
|
|
|
|
|
Ok(())
|
2025-08-01 10:04:12 -07:00
|
|
|
}
|
|
|
|
|
|
2025-08-06 00:07:58 -07:00
|
|
|
#[tokio::test]
|
2025-10-28 08:10:23 -07:00
|
|
|
async fn test_send_message_session_not_found() -> Result<()> {
|
2025-08-01 10:04:12 -07:00
|
|
|
// Start MCP without creating a Codex session
|
2025-10-28 08:10:23 -07:00
|
|
|
let codex_home = TempDir::new()?;
|
|
|
|
|
let mut mcp = McpProcess::new(codex_home.path()).await?;
|
|
|
|
|
timeout(DEFAULT_READ_TIMEOUT, mcp.initialize()).await??;
|
2025-08-01 10:04:12 -07:00
|
|
|
|
2025-09-18 07:37:03 -07:00
|
|
|
let unknown = ConversationId::new();
|
2025-08-01 10:04:12 -07:00
|
|
|
let req_id = mcp
|
2025-08-18 00:29:18 -07:00
|
|
|
.send_send_user_message_request(SendUserMessageParams {
|
|
|
|
|
conversation_id: unknown,
|
|
|
|
|
items: vec![InputItem::Text {
|
|
|
|
|
text: "ping".to_string(),
|
|
|
|
|
}],
|
|
|
|
|
})
|
2025-10-28 08:10:23 -07:00
|
|
|
.await?;
|
2025-08-01 10:04:12 -07:00
|
|
|
|
2025-08-18 00:29:18 -07:00
|
|
|
// Expect an error response for unknown conversation.
|
|
|
|
|
let err = timeout(
|
2025-08-01 10:04:12 -07:00
|
|
|
DEFAULT_READ_TIMEOUT,
|
2025-08-18 00:29:18 -07:00
|
|
|
mcp.read_stream_until_error_message(RequestId::Integer(req_id)),
|
2025-08-01 10:04:12 -07:00
|
|
|
)
|
2025-10-28 08:10:23 -07:00
|
|
|
.await??;
|
2025-08-18 00:29:18 -07:00
|
|
|
assert_eq!(err.id, RequestId::Integer(req_id));
|
2025-10-28 08:10:23 -07:00
|
|
|
Ok(())
|
2025-08-01 10:04:12 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// ---------------------------------------------------------------------------
|
|
|
|
|
// Helpers
|
|
|
|
|
// ---------------------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
fn create_config_toml(codex_home: &Path, server_uri: &str) -> std::io::Result<()> {
|
|
|
|
|
let config_toml = codex_home.join("config.toml");
|
|
|
|
|
std::fs::write(
|
|
|
|
|
config_toml,
|
|
|
|
|
format!(
|
|
|
|
|
r#"
|
|
|
|
|
model = "mock-model"
|
|
|
|
|
approval_policy = "never"
|
|
|
|
|
sandbox_mode = "danger-full-access"
|
|
|
|
|
|
|
|
|
|
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
|
|
|
|
|
"#
|
|
|
|
|
),
|
|
|
|
|
)
|
|
|
|
|
}
|
2025-10-24 15:41:52 -07:00
|
|
|
|
|
|
|
|
#[expect(clippy::expect_used)]
|
|
|
|
|
async fn read_raw_response_item(
|
|
|
|
|
mcp: &mut McpProcess,
|
|
|
|
|
conversation_id: ConversationId,
|
|
|
|
|
) -> ResponseItem {
|
|
|
|
|
let raw_notification: JSONRPCNotification = timeout(
|
|
|
|
|
DEFAULT_READ_TIMEOUT,
|
|
|
|
|
mcp.read_stream_until_notification_message("codex/event/raw_response_item"),
|
|
|
|
|
)
|
|
|
|
|
.await
|
|
|
|
|
.expect("codex/event/raw_response_item notification timeout")
|
|
|
|
|
.expect("codex/event/raw_response_item notification resp");
|
|
|
|
|
|
|
|
|
|
let serde_json::Value::Object(params) = raw_notification
|
|
|
|
|
.params
|
|
|
|
|
.expect("codex/event/raw_response_item should have params")
|
|
|
|
|
else {
|
|
|
|
|
panic!("codex/event/raw_response_item should have params");
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
let conversation_id_value = params
|
|
|
|
|
.get("conversationId")
|
|
|
|
|
.and_then(|value| value.as_str())
|
|
|
|
|
.expect("raw response item should include conversationId");
|
|
|
|
|
|
|
|
|
|
assert_eq!(
|
|
|
|
|
conversation_id_value,
|
|
|
|
|
conversation_id.to_string(),
|
|
|
|
|
"raw response item conversation mismatch"
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
let msg_value = params
|
|
|
|
|
.get("msg")
|
|
|
|
|
.cloned()
|
|
|
|
|
.expect("raw response item should include msg payload");
|
|
|
|
|
|
2025-10-29 13:32:40 -07:00
|
|
|
let event: RawResponseItemEvent =
|
|
|
|
|
serde_json::from_value(msg_value).expect("deserialize raw response item");
|
|
|
|
|
event.item
|
2025-10-24 15:41:52 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn assert_instructions_message(item: &ResponseItem) {
|
|
|
|
|
match item {
|
|
|
|
|
ResponseItem::Message { role, content, .. } => {
|
|
|
|
|
assert_eq!(role, "user");
|
|
|
|
|
let texts = content_texts(content);
|
2025-10-30 18:44:02 -07:00
|
|
|
let is_instructions = texts
|
|
|
|
|
.iter()
|
|
|
|
|
.any(|text| text.starts_with("# AGENTS.md instructions for "));
|
2025-10-24 15:41:52 -07:00
|
|
|
assert!(
|
2025-10-30 18:44:02 -07:00
|
|
|
is_instructions,
|
2025-10-24 15:41:52 -07:00
|
|
|
"expected instructions message, got {texts:?}"
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
other => panic!("expected instructions message, got {other:?}"),
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2025-10-30 11:18:31 -07:00
|
|
|
fn assert_developer_message(item: &ResponseItem, expected_text: &str) {
|
|
|
|
|
match item {
|
|
|
|
|
ResponseItem::Message { role, content, .. } => {
|
|
|
|
|
assert_eq!(role, "developer");
|
|
|
|
|
let texts = content_texts(content);
|
|
|
|
|
assert_eq!(
|
|
|
|
|
texts,
|
|
|
|
|
vec![expected_text],
|
|
|
|
|
"expected developer instructions message, got {texts:?}"
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
other => panic!("expected developer instructions message, got {other:?}"),
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2025-10-24 15:41:52 -07:00
|
|
|
fn assert_environment_message(item: &ResponseItem) {
|
|
|
|
|
match item {
|
|
|
|
|
ResponseItem::Message { role, content, .. } => {
|
|
|
|
|
assert_eq!(role, "user");
|
|
|
|
|
let texts = content_texts(content);
|
|
|
|
|
assert!(
|
|
|
|
|
texts
|
|
|
|
|
.iter()
|
|
|
|
|
.any(|text| text.contains("<environment_context>")),
|
|
|
|
|
"expected environment context message, got {texts:?}"
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
other => panic!("expected environment message, got {other:?}"),
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn assert_user_message(item: &ResponseItem, expected_text: &str) {
|
|
|
|
|
match item {
|
|
|
|
|
ResponseItem::Message { role, content, .. } => {
|
|
|
|
|
assert_eq!(role, "user");
|
|
|
|
|
let texts = content_texts(content);
|
|
|
|
|
assert_eq!(texts, vec![expected_text]);
|
|
|
|
|
}
|
|
|
|
|
other => panic!("expected user message, got {other:?}"),
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn assert_assistant_message(item: &ResponseItem, expected_text: &str) {
|
|
|
|
|
match item {
|
|
|
|
|
ResponseItem::Message { role, content, .. } => {
|
|
|
|
|
assert_eq!(role, "assistant");
|
|
|
|
|
let texts = content_texts(content);
|
|
|
|
|
assert_eq!(texts, vec![expected_text]);
|
|
|
|
|
}
|
|
|
|
|
other => panic!("expected assistant message, got {other:?}"),
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn content_texts(content: &[ContentItem]) -> Vec<&str> {
|
|
|
|
|
content
|
|
|
|
|
.iter()
|
|
|
|
|
.filter_map(|item| match item {
|
|
|
|
|
ContentItem::InputText { text } | ContentItem::OutputText { text } => {
|
|
|
|
|
Some(text.as_str())
|
|
|
|
|
}
|
|
|
|
|
_ => None,
|
|
|
|
|
})
|
|
|
|
|
.collect()
|
|
|
|
|
}
|