Skip to content

armgit / codex

Public Imported from GitHub
0

Lightweight coding agent that runs in your terminal

Rust

Serialize numeric custom reasoning effort as JSON numbers (#47590)

Dylan Hurdae132dc50ab5
diff --git a/codex-rs/codex-api/src/common.rs b/codex-rs/codex-api/src/common.rs
index 18128c472c..935ece0229 100644
--- a/codex-rs/codex-api/src/common.rs
+++ b/codex-rs/codex-api/src/common.rs
@@ -155,7 +155,10 @@ pub enum ReasoningContext {
#[derive(Debug, Serialize, Clone, PartialEq)]
pub struct Reasoning {
- #[serde(skip_serializing_if = "Option::is_none")]
+ #[serde(
+ skip_serializing_if = "Option::is_none",
+ serialize_with = "serialize_reasoning_effort"
+ )]
pub effort: Option<ReasoningEffortConfig>,
#[serde(skip_serializing_if = "Option::is_none")]
pub summary: Option<ReasoningSummaryConfig>,
@@ -163,6 +166,21 @@ pub struct Reasoning {
pub context: Option<ReasoningContext>,
}
+fn serialize_reasoning_effort<S>(
+ effort: &Option<ReasoningEffortConfig>,
+ serializer: S,
+) -> Result<S::Ok, S::Error>
+where
+ S: serde::Serializer,
+{
+ if let Some(ReasoningEffortConfig::Custom(value)) = effort
+ && let Ok(value) = value.parse::<u64>()
+ {
+ return serializer.serialize_u64(value);
+ }
+ effort.serialize(serializer)
+}
+
#[derive(Debug, Serialize, Clone, PartialEq)]
#[serde(rename_all = "snake_case")]
pub enum ReasoningSummaryDelivery {
diff --git a/codex-rs/core/tests/suite/client.rs b/codex-rs/core/tests/suite/client.rs
index ce0ce86784..cae43a74ee 100644
--- a/codex-rs/core/tests/suite/client.rs
+++ b/codex-rs/core/tests/suite/client.rs
@@ -2357,43 +2357,46 @@ async fn powershell_shell_version_is_model_visible_only_when_enabled() -> anyhow
}
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn includes_configured_max_effort_in_request() -> anyhow::Result<()> {
+async fn includes_configured_effort_in_request() -> anyhow::Result<()> {
skip_if_no_network!(Ok(()));
- let server = MockServer::start().await;
-
- let resp_mock = mount_sse_once(
- &server,
- sse(vec![ev_response_created("resp1"), ev_completed("resp1")]),
- )
- .await;
- let TestCodex { codex, .. } = test_codex()
- .with_model("gpt-5.4")
- .with_config(|config| {
- config.model_reasoning_effort = Some(ReasoningEffort::Max);
- })
- .build(&server)
- .await?;
-
- codex
- .start_or_steer_turn(TurnInputRequest::user_input(vec![UserInput::Text {
- text: "hello".into(),
- text_elements: Vec::new(),
- }]))
- .await
- .unwrap();
-
- wait_for_event(&codex, |ev| matches!(ev, EventMsg::TurnComplete(_))).await;
+ for (effort, expected) in [
+ ("max", json!("max")),
+ ("0", json!(0)),
+ ("64", json!(64)),
+ ("future", json!("future")),
+ ("-1", json!("-1")),
+ ("18446744073709551616", json!("18446744073709551616")),
+ ] {
+ let server = MockServer::start().await;
+ let resp_mock = mount_sse_once(
+ &server,
+ sse(vec![ev_response_created("resp1"), ev_completed("resp1")]),
+ )
+ .await;
+ let TestCodex { codex, .. } = test_codex()
+ .with_model("gpt-5.4")
+ .with_pre_build_hook(move |home| {
+ std::fs::write(
+ home.join("config.toml"),
+ format!("model_reasoning_effort = \"{effort}\"\n"),
+ )
+ .expect("write test config");
+ })
+ .build_with_auto_env(&server)
+ .await?;
- let request = resp_mock.single_request();
- let request_body = request.body_json();
+ codex
+ .start_or_steer_turn(TurnInputRequest::user_input(vec![UserInput::Text {
+ text: "hello".into(),
+ text_elements: Vec::new(),
+ }]))
+ .await
+ .unwrap();
- assert_eq!(
- request_body
- .get("reasoning")
- .and_then(|t| t.get("effort"))
- .and_then(|v| v.as_str()),
- Some("max")
- );
+ wait_for_event(&codex, |ev| matches!(ev, EventMsg::TurnComplete(_))).await;
+ let request = resp_mock.single_request();
+ assert_eq!(request.body_json()["reasoning"]["effort"], expected);
+ }
Ok(())
}