Skip to content

armgit / codex

Public Imported from GitHub
0

Lightweight coding agent that runs in your terminal

Rust

Set explicit turn triggers for exec and TUI requests (#46569)

Eddie Chenf81a6331b4fc
diff --git a/codex-rs/app-server/tests/suite/v2/turn_start.rs b/codex-rs/app-server/tests/suite/v2/turn_start.rs
index 0faf26cae7..4179365c1e 100644
--- a/codex-rs/app-server/tests/suite/v2/turn_start.rs
+++ b/codex-rs/app-server/tests/suite/v2/turn_start.rs
@@ -703,7 +703,7 @@ async fn turn_start_steers_active_turn_and_returns_active_turn_id() -> Result<()
text: "start".to_string(),
text_elements: Vec::new(),
}],
- turn_trigger: Some("user".to_string()),
+ turn_trigger: Some("goal".to_string()),
cyber_access_program: Some(CyberAccessProgram::DaybreakBlue),
..Default::default()
},
@@ -746,7 +746,7 @@ async fn turn_start_steers_active_turn_and_returns_active_turn_id() -> Result<()
text: "steer".to_string(),
text_elements: Vec::new(),
}],
- turn_trigger: Some("goal".to_string()),
+ turn_trigger: Some("user".to_string()),
cyber_access_program: Some(CyberAccessProgram::Standard),
..Default::default()
},
@@ -773,7 +773,7 @@ async fn turn_start_steers_active_turn_and_returns_active_turn_id() -> Result<()
.as_str()
.context("expected x-codex-turn-metadata")?,
)?;
- assert_eq!(turn_metadata["turn_trigger"].as_str(), Some("user"));
+ assert_eq!(turn_metadata["turn_trigger"].as_str(), Some("goal"));
}
Ok(())
}
diff --git a/codex-rs/exec/src/lib.rs b/codex-rs/exec/src/lib.rs
index b56a56f1eb..2c8bbdc0db 100644
--- a/codex-rs/exec/src/lib.rs
+++ b/codex-rs/exec/src/lib.rs
@@ -1141,7 +1141,7 @@ async fn run_exec_session(args: ExecRunArgs) -> anyhow::Result<()> {
params: TurnStartParams {
disabled_plugin_ids: None,
thread_id: primary_thread_id_for_span.clone(),
- turn_trigger: None,
+ turn_trigger: Some("exec".to_string()),
client_user_message_id: None,
input: items.into_iter().map(Into::into).collect(),
tool_output: None,
diff --git a/codex-rs/exec/tests/suite/resume.rs b/codex-rs/exec/tests/suite/resume.rs
index d318bcf737..1594b6db66 100644
--- a/codex-rs/exec/tests/suite/resume.rs
+++ b/codex-rs/exec/tests/suite/resume.rs
@@ -238,6 +238,18 @@ async fn exec_resume_last_appends_to_existing_file() -> anyhow::Result<()> {
assert!(content.contains(&marker2));
let requests = response_mock.requests();
assert_eq!(requests.len(), 2);
+ for request in &requests {
+ let body = request.body_json();
+ let metadata: Value = serde_json::from_str(
+ body["client_metadata"]["x-codex-turn-metadata"]
+ .as_str()
+ .context("canonical turn metadata")?,
+ )?;
+ assert_eq!(
+ (&metadata["thread_id"], &metadata["turn_trigger"]),
+ (&meta["payload"]["id"], &serde_json::json!("exec"))
+ );
+ }
let resumed_request = requests[1].body_json().to_string();
assert!(resumed_request.contains(&marker));
assert!(resumed_request.contains(&marker2));
diff --git a/codex-rs/tui/src/app_server_session.rs b/codex-rs/tui/src/app_server_session.rs
index ee6e92666f..3e64dc0d92 100644
--- a/codex-rs/tui/src/app_server_session.rs
+++ b/codex-rs/tui/src/app_server_session.rs
@@ -1363,7 +1363,7 @@ impl AppServerSession {
params: TurnStartParams {
disabled_plugin_ids: None,
thread_id: thread_id.to_string(),
- turn_trigger: None,
+ turn_trigger: Some("user".to_string()),
client_user_message_id: Some(client_user_message_id),
input: items,
tool_output: None,
diff --git a/codex-rs/tui/src/app_server_session/reasoning_defaults_tests.rs b/codex-rs/tui/src/app_server_session/reasoning_defaults_tests.rs
index d57115a686..189dfce2bd 100644
--- a/codex-rs/tui/src/app_server_session/reasoning_defaults_tests.rs
+++ b/codex-rs/tui/src/app_server_session/reasoning_defaults_tests.rs
@@ -1,4 +1,4 @@
-//! Verify embedded TUI reasoning configuration and its outbound model request.
+//! Verify embedded TUI reasoning configuration and metadata on its outbound model request.
use super::*;
use crate::legacy_core::config::ConfigBuilder;
@@ -70,20 +70,27 @@ stream_max_retries = 0
.await?;
let mut app_server = crate::start_embedded_app_server_for_picker(&config).await?;
let started = app_server.start_thread(&config).await?;
- let request_id = app_server.next_request_id();
- let _: TurnStartResponse = app_server
- .client
- .request_typed(ClientRequest::TurnStart {
- request_id,
- params: TurnStartParams {
- thread_id: started.session.thread_id.to_string(),
- input: vec![UserInput::Text {
- text: "hello".to_string(),
- text_elements: Vec::new(),
- }],
- ..Default::default()
- },
- })
+ let turn = app_server
+ .turn_start(
+ started.session.thread_id,
+ "tui-user-message".to_string(),
+ vec![UserInput::Text {
+ text: "hello".to_string(),
+ text_elements: Vec::new(),
+ }],
+ config.cwd.to_path_buf(),
+ /*approval_policy*/ None,
+ /*approvals_reviewer*/ None,
+ TurnPermissionsOverride::Preserve,
+ &config.workspace_roots,
+ started.session.model.clone(),
+ /*effort*/ None,
+ /*summary*/ None,
+ /*service_tier*/ None,
+ /*collaboration_mode*/ None,
+ /*personality*/ None,
+ /*output_schema*/ None,
+ )
.await?;
tokio::time::timeout(std::time::Duration::from_secs(/*secs*/ 30), async {
while let Some(event) = app_server.next_event().await {
@@ -106,6 +113,23 @@ stream_max_retries = 0
json!({"summary": summary, "stream_options": stream_options}),
"settings: {settings}"
);
+ let metadata: serde_json::Value = serde_json::from_str(
+ body["client_metadata"]["x-codex-turn-metadata"]
+ .as_str()
+ .expect("canonical turn metadata"),
+ )?;
+ assert_eq!(
+ (
+ &metadata["thread_id"],
+ &metadata["turn_id"],
+ &metadata["turn_trigger"],
+ ),
+ (
+ &json!(started.session.thread_id),
+ &json!(turn.turn.id),
+ &json!("user"),
+ )
+ );
app_server.shutdown().await?;
}
Ok(())