diff --git a/codex-rs/core/src/agent/control.rs b/codex-rs/core/src/agent/control.rs index 51f92fa863..6435d93409 100644 --- a/codex-rs/core/src/agent/control.rs +++ b/codex-rs/core/src/agent/control.rs @@ -93,6 +93,8 @@ pub(crate) struct SpawnAgentOptions { pub(crate) fork_mode: Option, pub(crate) parent_thread_id: Option, pub(crate) parent_turn_id: Option, + /// Attribute delegated usage to the turn that initiated it. + pub(crate) turn_trigger: Option, pub(crate) root_turn_id: Option, pub(crate) environments: Option>, pub(crate) multi_agent_v2_usage_hints: Option, diff --git a/codex-rs/core/src/agent/control/spawn.rs b/codex-rs/core/src/agent/control/spawn.rs index 6dccadb96d..306e770bcd 100644 --- a/codex-rs/core/src/agent/control/spawn.rs +++ b/codex-rs/core/src/agent/control/spawn.rs @@ -765,6 +765,7 @@ impl AgentControl { let start_options = TurnStartOptions { parent_turn_id: options.parent_turn_id, + turn_trigger: options.turn_trigger, root_turn_id: options.root_turn_id, cyber_access_program: options.cyber_access_program, ..Default::default() diff --git a/codex-rs/core/src/guardian/mod.rs b/codex-rs/core/src/guardian/mod.rs index f8e02251fd..3b2705489e 100644 --- a/codex-rs/core/src/guardian/mod.rs +++ b/codex-rs/core/src/guardian/mod.rs @@ -67,7 +67,7 @@ const GUARDIAN_MAX_MESSAGE_ENTRY_TOKENS: usize = 5_000; const GUARDIAN_MAX_TOOL_ENTRY_TOKENS: usize = 1_000; pub(crate) const GUARDIAN_MAX_ROOT_MESSAGE_TOKENS: usize = 900; pub(crate) const GUARDIAN_MAX_NODE_REPL_TOOL_RESULT_TOKENS: usize = 6_000; -pub(crate) const GUARDIAN_MAX_ACTION_BYTES: usize = 8_000; +pub(crate) const GUARDIAN_MAX_ACTION_BYTES: usize = 50_000 * 4; const GUARDIAN_MAX_ACTION_STRING_TOKENS: usize = 16_000; const GUARDIAN_RECENT_ENTRY_LIMIT: usize = 40; diff --git a/codex-rs/core/src/guardian/tests.rs b/codex-rs/core/src/guardian/tests.rs index c02973f46c..be1e6fef69 100644 --- a/codex-rs/core/src/guardian/tests.rs +++ b/codex-rs/core/src/guardian/tests.rs @@ -1229,7 +1229,7 @@ fn guardian_action_formatters_reject_large_aggregate_payloads() { let action = GuardianApprovalRequest::ApplyPatch { id: "patch-1".to_string(), cwd: test_path_buf("/tmp").abs().into(), - files: vec![file; 1_000], + files: vec![file; 20_000], patch: String::new(), }; @@ -1241,7 +1241,7 @@ fn guardian_action_formatters_reject_large_aggregate_payloads() { error .expect_err("aggregate action should exceed the review limit") .to_string(), - "Guardian action exceeds the 8000-byte review limit" + "Guardian action exceeds the 200000-byte review limit" ); } } diff --git a/codex-rs/core/src/session/turn_input_tests.rs b/codex-rs/core/src/session/turn_input_tests.rs index 8c2d7c5b6a..77dc3f4282 100644 --- a/codex-rs/core/src/session/turn_input_tests.rs +++ b/codex-rs/core/src/session/turn_input_tests.rs @@ -858,6 +858,9 @@ async fn steer_only_requires_active_turn() { #[tokio::test] async fn steer_only_enforces_expected_turn_id() { let (session, turn_context, _rx) = make_session_and_context_with_rx().await; + turn_context + .turn_metadata_state + .set_turn_trigger("composer".to_string()); session .spawn_task( Arc::clone(&turn_context), @@ -904,7 +907,12 @@ async fn steer_only_enforces_expected_turn_id() { let submission = handle( &session, - TurnInputRequest::new(SubmittedTurnInput::ResponseItem(output)), + TurnInputRequest::new(SubmittedTurnInput::ResponseItem(output)).on_start( + TurnStartOptions { + turn_trigger: Some("automation_cron_scheduled".to_string()), + ..Default::default() + }, + ), TurnInputMode::StartOrSteer, "test-submission".to_string(), ) @@ -917,6 +925,13 @@ async fn steer_only_enforces_expected_turn_id() { turn_id: turn_context.sub_id.clone() } ); + assert_eq!( + turn_context + .turn_metadata_state + .current_turn_trigger() + .as_deref(), + Some("composer") + ); let turn_state = session .input_queue .turn_state_for_sub_id(&session.active_turn, &turn_context.sub_id) diff --git a/codex-rs/core/src/tasks/mod.rs b/codex-rs/core/src/tasks/mod.rs index d976a0ea29..515f3bb751 100644 --- a/codex-rs/core/src/tasks/mod.rs +++ b/codex-rs/core/src/tasks/mod.rs @@ -478,6 +478,9 @@ impl Session { }, ) .await; + if let Some(trigger) = start_options.turn_trigger { + turn_context.turn_metadata_state.set_turn_trigger(trigger); + } if let Some(id) = start_options.parent_turn_id { if let Some(initiating_agent_path) = input.iter().find_map(|item| { let TurnInput::InterAgentCommunication(communication) = item else { diff --git a/codex-rs/core/src/tools/handlers/multi_agents/send_input.rs b/codex-rs/core/src/tools/handlers/multi_agents/send_input.rs index 33e228fae5..51b902c89c 100644 --- a/codex-rs/core/src/tools/handlers/multi_agents/send_input.rs +++ b/codex-rs/core/src/tools/handlers/multi_agents/send_input.rs @@ -93,6 +93,7 @@ impl Handler { crate::TurnStartOptions { parent_turn_id: Some(turn.sub_id.clone()), root_turn_id: turn.turn_metadata_state.root_turn_id(), + turn_trigger: turn.turn_metadata_state.current_turn_trigger(), cyber_access_program: turn.cyber_access_program, ..Default::default() }, diff --git a/codex-rs/core/src/tools/handlers/multi_agents/spawn.rs b/codex-rs/core/src/tools/handlers/multi_agents/spawn.rs index bd9fe9f74a..a9615aeca8 100644 --- a/codex-rs/core/src/tools/handlers/multi_agents/spawn.rs +++ b/codex-rs/core/src/tools/handlers/multi_agents/spawn.rs @@ -124,6 +124,7 @@ async fn handle_spawn_agent( parent_thread_id: Some(session.thread_id), parent_turn_id: Some(turn.sub_id.clone()), root_turn_id: turn.turn_metadata_state.root_turn_id(), + turn_trigger: turn.turn_metadata_state.current_turn_trigger(), environments: Some(step_context.environments.to_selections()), multi_agent_v2_usage_hints: None, cyber_access_program: turn.cyber_access_program, diff --git a/codex-rs/core/src/tools/handlers/multi_agents_v2/message_tool.rs b/codex-rs/core/src/tools/handlers/multi_agents_v2/message_tool.rs index 9f0ac3cb13..a88c765125 100644 --- a/codex-rs/core/src/tools/handlers/multi_agents_v2/message_tool.rs +++ b/codex-rs/core/src/tools/handlers/multi_agents_v2/message_tool.rs @@ -120,6 +120,7 @@ pub(super) async fn handle_message_string_tool( crate::TurnStartOptions { parent_turn_id, root_turn_id: turn.turn_metadata_state.root_turn_id(), + turn_trigger: turn.turn_metadata_state.current_turn_trigger(), cyber_access_program: turn.cyber_access_program, ..Default::default() }, diff --git a/codex-rs/core/src/tools/handlers/multi_agents_v2/spawn.rs b/codex-rs/core/src/tools/handlers/multi_agents_v2/spawn.rs index 3684156f98..41d394243f 100644 --- a/codex-rs/core/src/tools/handlers/multi_agents_v2/spawn.rs +++ b/codex-rs/core/src/tools/handlers/multi_agents_v2/spawn.rs @@ -219,6 +219,7 @@ async fn handle_spawn_agent( parent_thread_id: Some(session.thread_id), parent_turn_id: Some(turn.sub_id.clone()), root_turn_id: turn.turn_metadata_state.root_turn_id(), + turn_trigger: turn.turn_metadata_state.current_turn_trigger(), environments: Some(step_context.environments.to_selections()), multi_agent_v2_usage_hints, cyber_access_program: turn.cyber_access_program, diff --git a/codex-rs/core/src/turn_metadata.rs b/codex-rs/core/src/turn_metadata.rs index 5c30fd202f..b15858a251 100644 --- a/codex-rs/core/src/turn_metadata.rs +++ b/codex-rs/core/src/turn_metadata.rs @@ -339,6 +339,10 @@ impl TurnMetadataState { let _ = self.turn_trigger.set(turn_trigger); } + pub(crate) fn current_turn_trigger(&self) -> Option { + self.turn_trigger.get().cloned() + } + pub(crate) fn root_turn_id(&self) -> Option { self.root_turn_id.get().cloned() } diff --git a/codex-rs/core/src/unified_exec/process_manager.rs b/codex-rs/core/src/unified_exec/process_manager.rs index a224b5f646..f19147f660 100644 --- a/codex-rs/core/src/unified_exec/process_manager.rs +++ b/codex-rs/core/src/unified_exec/process_manager.rs @@ -102,6 +102,7 @@ const UNIFIED_EXEC_ENV: [(&str, &str); 10] = [ const NETWORK_ACCESS_DENIED_MESSAGE: &str = "Network access was denied by the Codex sandbox network proxy."; const LATE_NETWORK_DENIAL_GRACE_PERIOD: Duration = Duration::from_millis(100); +const MAX_STDIN_APPROVAL_BYTES: usize = 8_000; const INTERRUPT: &str = "\u{3}"; /// Test-only override for deterministic unified exec process IDs. @@ -862,7 +863,7 @@ impl UnifiedExecProcessManager { // Bound the entire serialized action plus its reason, including JSON // escaping. Reject, never execute an unreviewed tail. let oversized = reviewed.text.len().saturating_add(approval_reason.len()) - > crate::guardian::GUARDIAN_MAX_ACTION_BYTES; + > MAX_STDIN_APPROVAL_BYTES; let size_check_result = if reviewed.truncated { "formatter_truncated" } else if oversized { diff --git a/codex-rs/core/tests/suite/guardian_mcp_elicitation.rs b/codex-rs/core/tests/suite/guardian_mcp_elicitation.rs index c028c736e4..bd4ee08ec6 100644 --- a/codex-rs/core/tests/suite/guardian_mcp_elicitation.rs +++ b/codex-rs/core/tests/suite/guardian_mcp_elicitation.rs @@ -417,7 +417,7 @@ async fn node_elicitations_attribute_independent_reviews_without_changing_action "connector_name": "Inner Connector", "connector_description": "Connector for the reviewed inner action", "tool_title": "Inner action", - "tool_description": "Review this action independently from JavaScript", + "tool_description": "Review this action independently from JavaScript".repeat(220), }); match call_id_source { CallIdSource::Host | CallIdSource::Missing => {} @@ -607,7 +607,7 @@ async fn node_elicitations_attribute_independent_reviews_without_changing_action "connector_id": "inner-connector", "connector_name": "Inner Connector", "connector_description": "Connector for the reviewed inner action", "tool_title": "Inner action", - "tool_description": "Review this action independently from JavaScript", + "tool_description": "Review this action independently from JavaScript".repeat(220), }) ); } diff --git a/codex-rs/core/tests/suite/subagent_notifications.rs b/codex-rs/core/tests/suite/subagent_notifications.rs index 4adf018bc6..d41fabb201 100644 --- a/codex-rs/core/tests/suite/subagent_notifications.rs +++ b/codex-rs/core/tests/suite/subagent_notifications.rs @@ -2,6 +2,7 @@ use anyhow::Result; use codex_core::StartThreadOptions; use codex_core::ThreadConfigSnapshot; use codex_core::TurnInputRequest; +use codex_core::TurnStartOptions; use codex_core::config::AgentRoleConfig; use codex_core::config::CurrentTimeReminderConfig; use codex_features::Feature; @@ -1037,7 +1038,7 @@ async fn spawned_child_receives_forked_parent_context( test.submit_turn(TURN_0_FORK_PROMPT).await?; let _ = seed_turn.single_request(); - test.submit_turn(TURN_1_PROMPT).await?; + submit_turn_with_trigger(&test, TURN_1_PROMPT, "composer").await?; let parent_body = spawn_turn.single_request().body_json(); let child_request = wait_for_request_with_model(&child_request_log, REQUESTED_MODEL).await?; @@ -1048,7 +1049,13 @@ async fn spawned_child_receives_forked_parent_context( .as_str() .expect("child turn metadata"), )?; - assert_eq!(child_metadata["thread_source"], "subagent"); + assert_eq!( + ( + &child_metadata["thread_source"], + &child_metadata["turn_trigger"] + ), + (&json!("subagent"), &json!("composer")), + ); let original_parent_turn_id = parent_body["client_metadata"]["turn_id"] .as_str() .expect("legacy spawn parent turn id"); @@ -1106,7 +1113,7 @@ async fn spawned_child_receives_forked_parent_context( ) .await; - test.submit_turn("reuse the legacy child").await?; + submit_turn_with_trigger(&test, "reuse the legacy child", "automation_cron_scheduled").await?; let followup_parent_body = parent.single_request().body_json(); let reused_child_body = wait_for_request_with_model(&followup, REQUESTED_MODEL) .await? @@ -1121,6 +1128,32 @@ async fn spawned_child_receives_forked_parent_context( assert_parent_turn(&reused_child_body, Some(followup_parent_turn_id))?; assert_root_turn(&followup_parent_body, Some(followup_parent_turn_id))?; assert_root_turn(&reused_child_body, Some(followup_parent_turn_id))?; + let reused_metadata: Value = serde_json::from_str( + reused_child_body["client_metadata"]["x-codex-turn-metadata"] + .as_str() + .expect("reused child turn metadata"), + )?; + assert_eq!(reused_metadata["turn_trigger"], "automation_cron_scheduled"); + Ok(()) +} + +async fn submit_turn_with_trigger(test: &TestCodex, prompt: &str, trigger: &str) -> Result<()> { + test.codex + .start_or_steer_turn( + TurnInputRequest::user_input(vec![UserInput::Text { + text: prompt.to_string(), + text_elements: Vec::new(), + }]) + .on_start(TurnStartOptions { + turn_trigger: Some(trigger.to_string()), + ..Default::default() + }), + ) + .await?; + wait_for_event(&test.codex, |event| { + matches!(event, EventMsg::TurnComplete(_)) + }) + .await; Ok(()) } @@ -1302,7 +1335,7 @@ async fn grandchild_full_fork_preserves_context_baseline( .build_with_auto_env(&server) .await?; - test.submit_turn(ROOT_PROMPT).await?; + submit_turn_with_trigger(&test, ROOT_PROMPT, "automation_heartbeat_scheduled").await?; let root_request = root_log.single_request(); let mut descendant_requests = Vec::new(); for (mock, agent_name) in [ @@ -1337,6 +1370,15 @@ async fn grandchild_full_fork_preserves_context_baseline( } }) .await?; + let metadata: Value = serde_json::from_str( + request.body_json()["client_metadata"]["x-codex-turn-metadata"] + .as_str() + .expect("descendant turn metadata"), + )?; + assert_eq!( + (&metadata["thread_source"], &metadata["turn_trigger"]), + (&json!("subagent"), &json!("automation_heartbeat_scheduled")), + ); descendant_requests.push(request); } let context_counts = [ @@ -2717,7 +2759,7 @@ async fn multi_agent_v2_peer_followup_completion_notifies_initiating_turn() -> R ) .await; - test.submit_turn(SPAWN_WORKER_PROMPT).await?; + submit_turn_with_trigger(&test, SPAWN_WORKER_PROMPT, "automation_cron_scheduled").await?; let worker_thread_id = created_threads.recv().await?; let worker_thread = test.thread_manager.get_thread(worker_thread_id).await?; wait_for_event(worker_thread.as_ref(), |event| { @@ -2816,7 +2858,7 @@ async fn multi_agent_v2_peer_followup_completion_notifies_initiating_turn() -> R ); } - test.submit_turn(SPAWN_REQUESTER_PROMPT).await?; + submit_turn_with_trigger(&test, SPAWN_REQUESTER_PROMPT, "composer").await?; let requester_thread_id = created_threads.recv().await?; let requester_thread = test.thread_manager.get_thread(requester_thread_id).await?; let requester_turn_id = wait_for_event_match(requester_thread.as_ref(), |event| match event { @@ -2845,6 +2887,13 @@ async fn multi_agent_v2_peer_followup_completion_notifies_initiating_turn() -> R (body["client_metadata"]["thread_id"] == json!(worker_thread_id) && request.body_contains_text(WORKER_FOLLOWUP_TASK)) .then(|| { + let metadata: Value = serde_json::from_str( + body["client_metadata"]["x-codex-turn-metadata"] + .as_str() + .expect("worker turn metadata"), + ) + .expect("worker turn metadata JSON"); + assert_eq!(metadata["turn_trigger"], "composer"); body["client_metadata"]["turn_id"] .as_str() .expect("worker follow-up turn ID")