mirror of
https://github.com/openai/codex.git
synced 2026-11-18 22:20:48 +00:00
Capture local attachments before queuing turn input (#61962)
## Why Queued input can outlive its local attachment files. Reading those files only when rendering a model message can lose media submitted while turn admission is pending. ## What changed - Introduce `ResolvedUserInput` to carry captured image bytes, audio data URLs, or read errors through session queues and agent input. - Resolve client attachments on the submitting host before queuing, using a blocking task for local file reads. - Render messages from captured payloads while preserving original paths and text spans for display, along with image position mappings. ## Testing Add coverage for rendering and serialization after source files are removed, steered audio retained during pending admission, and local audio errors and display content. GitOrigin-RevId: 4bbb6bda44167439a8cfdae15d3c476a7b1d336b
This commit is contained in:
committed by
copyberry
parent
65a4450886
commit
d8d840d32a
@@ -1,5 +1,6 @@
|
||||
use super::Submission;
|
||||
use super::sampling_interrupt::SamplingInterrupt;
|
||||
use super::submission::SubmissionOp;
|
||||
use crate::McpRefreshReason;
|
||||
use crate::WithTurnExtensionData;
|
||||
use crate::realtime_conversation::handle_audio as handle_realtime_conversation_audio;
|
||||
@@ -549,7 +550,8 @@ pub(super) async fn submission_loop(
|
||||
},
|
||||
async {
|
||||
while let Ok(sub) = rx_sub.recv().await {
|
||||
if let Op::InterAgentCommunication { communication, start_options } = sub.op
|
||||
if let SubmissionOp::Protocol(op) = sub.op
|
||||
&& let Op::InterAgentCommunication { communication, start_options } = *op
|
||||
&& sub.message_delivery.as_ref().is_some_and(crate::agent_communication::MessageDelivery::awaits_result_write)
|
||||
{
|
||||
let mail = crate::PendingAgentMessage::new(communication, sub.message_delivery);
|
||||
@@ -611,7 +613,23 @@ pub(super) async fn submission_loop(
|
||||
);
|
||||
let dispatch_span = submission_dispatch_span(&sub);
|
||||
let should_exit = async {
|
||||
match sub.op {
|
||||
let op = match sub.op {
|
||||
SubmissionOp::TurnInput {
|
||||
request,
|
||||
mode,
|
||||
reply,
|
||||
} => {
|
||||
let request = WithTurnExtensionData {
|
||||
request: *request,
|
||||
turn_extension_init: sub.turn_extension_init,
|
||||
};
|
||||
let result = turn_input::handle(&sess, request, mode, sub.id.clone()).await;
|
||||
let _ = reply.send(result);
|
||||
return false;
|
||||
}
|
||||
SubmissionOp::Protocol(op) => *op,
|
||||
};
|
||||
match op {
|
||||
Op::Interrupt => {
|
||||
interrupt(&sess).await;
|
||||
false
|
||||
@@ -702,19 +720,6 @@ pub(super) async fn submission_loop(
|
||||
realtime_conversation_list_voices(&sess, sub.id.clone()).await;
|
||||
false
|
||||
}
|
||||
Op::TurnInput {
|
||||
request,
|
||||
mode,
|
||||
reply,
|
||||
} => {
|
||||
let request = WithTurnExtensionData {
|
||||
request: *request,
|
||||
turn_extension_init: sub.turn_extension_init,
|
||||
};
|
||||
let result = turn_input::handle(&sess, request, mode, sub.id.clone()).await;
|
||||
let _ = reply.send(result);
|
||||
false
|
||||
}
|
||||
Op::RecoverTurn {
|
||||
thread_settings,
|
||||
start_options,
|
||||
@@ -971,8 +976,8 @@ async fn approve_guardian_denied_action(sess: &Arc<Session>, event: GuardianAsse
|
||||
pub(super) fn submission_dispatch_span(sub: &Submission) -> tracing::Span {
|
||||
let op_name = sub.op.kind();
|
||||
let span_name = format!("op.dispatch.{op_name}");
|
||||
let dispatch_span = match &sub.op {
|
||||
Op::RealtimeConversationAudio(_) => {
|
||||
let dispatch_span = match sub.op.as_protocol() {
|
||||
Some(Op::RealtimeConversationAudio(_)) => {
|
||||
debug_span!(
|
||||
"submission_dispatch",
|
||||
otel.name = span_name.as_str(),
|
||||
|
||||
@@ -8,7 +8,7 @@ use codex_history::ResponseItemEnvelope;
|
||||
use codex_protocol::ThreadId;
|
||||
use codex_protocol::models::ResponseItem;
|
||||
use codex_protocol::turn_input::TurnStartOptions;
|
||||
use codex_protocol::user_input::UserInput;
|
||||
use codex_user_input::ResolvedUserInput;
|
||||
use serde::Deserialize;
|
||||
use serde::Serialize;
|
||||
use std::collections::BTreeMap;
|
||||
@@ -43,7 +43,7 @@ pub struct UserInputMetadata {
|
||||
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
|
||||
pub enum TurnInput {
|
||||
UserInput {
|
||||
content: Vec<UserInput>,
|
||||
content: Vec<ResolvedUserInput>,
|
||||
client_id: Option<String>,
|
||||
#[serde(flatten)]
|
||||
metadata: UserInputMetadata,
|
||||
@@ -569,7 +569,7 @@ mod tests {
|
||||
use codex_history::CodexHarnessMetadata;
|
||||
use codex_protocol::AgentPath;
|
||||
use codex_protocol::protocol::InterAgentCommunication;
|
||||
use codex_protocol::user_input::UserInput;
|
||||
use codex_user_input::ResolvedUserInput;
|
||||
use pretty_assertions::assert_eq;
|
||||
|
||||
#[test]
|
||||
@@ -697,10 +697,7 @@ mod tests {
|
||||
&turn_state,
|
||||
vec![TurnInput::UserInput {
|
||||
metadata: Default::default(),
|
||||
content: vec![UserInput::Text {
|
||||
text: "steer".to_string(),
|
||||
text_elements: Vec::new(),
|
||||
}],
|
||||
content: vec![ResolvedUserInput::text("steer".to_string())],
|
||||
client_id: None,
|
||||
}],
|
||||
)
|
||||
@@ -789,10 +786,7 @@ mod tests {
|
||||
&turn_state,
|
||||
vec![TurnInput::UserInput {
|
||||
metadata: Default::default(),
|
||||
content: vec![UserInput::Text {
|
||||
text: "already pending".to_string(),
|
||||
text_elements: Vec::new(),
|
||||
}],
|
||||
content: vec![ResolvedUserInput::text("already pending".to_string())],
|
||||
client_id: None,
|
||||
}],
|
||||
)
|
||||
|
||||
@@ -263,9 +263,10 @@ mod guardian_checkpoint;
|
||||
mod handlers;
|
||||
pub(crate) mod inject;
|
||||
mod reasoning_effort;
|
||||
mod submission;
|
||||
pub(crate) mod submission;
|
||||
pub(crate) use reasoning_effort::RequestEffortUsage;
|
||||
pub(crate) use submission::Submission;
|
||||
use submission::SubmissionOp;
|
||||
mod cloud_plugins;
|
||||
mod input_queue;
|
||||
mod mcp;
|
||||
@@ -429,7 +430,7 @@ use codex_protocol::user_input::UserInput;
|
||||
use codex_skills_extension::HostSkillsService;
|
||||
use codex_tools::ToolName;
|
||||
use codex_user_input::LocalImagePreparation;
|
||||
use codex_user_input::from_user_input;
|
||||
use codex_user_input::ResolvedUserInput;
|
||||
use codex_utils_absolute_path::AbsolutePathBuf;
|
||||
#[cfg(test)]
|
||||
use codex_utils_stream_parser::ProposedPlanSegment;
|
||||
@@ -1203,7 +1204,7 @@ impl SessionIo {
|
||||
} = op.into();
|
||||
let sub = Submission {
|
||||
id: id.clone(),
|
||||
op,
|
||||
op: op.into(),
|
||||
turn_extension_init,
|
||||
trace,
|
||||
parent_turn_id,
|
||||
@@ -1233,7 +1234,7 @@ impl SessionIo {
|
||||
/// session loop exits before replying, the caller gets `InternalAgentDied`.
|
||||
pub(crate) async fn submit_turn_input(
|
||||
&self,
|
||||
request: impl Into<WithTurnExtensionData<TurnInputRequest>>,
|
||||
request: impl Into<WithTurnExtensionData<TurnInputRequest<ResolvedUserInput>>>,
|
||||
mode: TurnInputMode,
|
||||
) -> CodexResult<TurnInputSubmission> {
|
||||
let id = new_submission_id();
|
||||
@@ -1245,7 +1246,7 @@ impl SessionIo {
|
||||
let trace = request.trace.take();
|
||||
self.submit_with_id(Box::new(Submission {
|
||||
id,
|
||||
op: Op::TurnInput {
|
||||
op: SubmissionOp::TurnInput {
|
||||
request: Box::new(request),
|
||||
mode,
|
||||
reply: reply_tx,
|
||||
@@ -1276,7 +1277,8 @@ impl SessionIo {
|
||||
thread_settings,
|
||||
start_options,
|
||||
reply: reply_tx,
|
||||
},
|
||||
}
|
||||
.into(),
|
||||
trace,
|
||||
turn_extension_init,
|
||||
parent_turn_id: None,
|
||||
@@ -4007,20 +4009,21 @@ impl Session {
|
||||
assign_missing_item_id(item, &self.item_id_generator);
|
||||
}
|
||||
|
||||
pub(crate) fn response_item_from_user_input(&self, input: Vec<UserInput>) -> ResponseItem {
|
||||
self.response_item_from_user_input_with_image_positions(input, &mut HashMap::new())
|
||||
pub(crate) fn response_item_from_user_input(
|
||||
&self,
|
||||
input: &[ResolvedUserInput],
|
||||
) -> ResponseItem {
|
||||
self.response_item_from_user_input_with_image_positions(input)
|
||||
.0
|
||||
}
|
||||
|
||||
fn response_item_from_user_input_with_image_positions(
|
||||
&self,
|
||||
input: Vec<UserInput>,
|
||||
user_image_content_indices: &mut HashMap<usize, usize>,
|
||||
) -> ResponseItem {
|
||||
let mut item = ResponseItem::from(from_user_input(
|
||||
input,
|
||||
LocalImagePreparation::Defer,
|
||||
user_image_content_indices,
|
||||
));
|
||||
input: &[ResolvedUserInput],
|
||||
) -> (ResponseItem, HashMap<usize, usize>) {
|
||||
let (message, image_positions) =
|
||||
ResolvedUserInput::into_message(input, LocalImagePreparation::Defer);
|
||||
let mut item = ResponseItem::from(message);
|
||||
if let ResponseItem::Message {
|
||||
content,
|
||||
internal_chat_message_metadata_passthrough,
|
||||
@@ -4049,7 +4052,7 @@ impl Session {
|
||||
..Default::default()
|
||||
});
|
||||
}
|
||||
item
|
||||
(item, image_positions)
|
||||
}
|
||||
|
||||
/// Appends to history, persists the prepared items, then notifies raw-item observers.
|
||||
@@ -5944,19 +5947,20 @@ impl Session {
|
||||
&self,
|
||||
turn_context: &TurnContext,
|
||||
model_info: &ModelInfo,
|
||||
input: &[UserInput],
|
||||
input: &[ResolvedUserInput],
|
||||
client_id: Option<String>,
|
||||
metadata: UserInputMetadata,
|
||||
persist_context: PersistContext,
|
||||
) {
|
||||
// Persist the user message to history, but emit the turn item from `UserInput` so
|
||||
// UI-only `text_elements` are preserved. `ResponseItem::Message` does not carry
|
||||
// those spans, and `record_response_item_and_emit_turn_item` would drop them.
|
||||
let mut user_image_content_indices = HashMap::new();
|
||||
let mut response_item = self.response_item_from_user_input_with_image_positions(
|
||||
input.to_vec(),
|
||||
&mut user_image_content_indices,
|
||||
);
|
||||
let display_input = input
|
||||
.iter()
|
||||
.map(ResolvedUserInput::to_user_input)
|
||||
.collect::<Vec<_>>();
|
||||
let mut user_message_item = UserMessageItem::new(&display_input);
|
||||
// Emit full prompt telemetry only for inputs selected for recording.
|
||||
turn_context.session_telemetry.user_prompt(&display_input);
|
||||
let (mut response_item, user_image_content_indices) =
|
||||
self.response_item_from_user_input_with_image_positions(input);
|
||||
if let Some(uuid) = metadata.response_item_uuid {
|
||||
response_item.set_id(Some(ResponseItemId::for_admitted_user_input(uuid)));
|
||||
}
|
||||
@@ -5985,7 +5989,6 @@ impl Session {
|
||||
}],
|
||||
)
|
||||
.await;
|
||||
let mut user_message_item = UserMessageItem::new(input);
|
||||
apply_prepared_image_file_ids(
|
||||
&mut user_message_item,
|
||||
&prepared_items,
|
||||
|
||||
@@ -34,10 +34,9 @@ async fn task_finish_preserves_notification_budget_and_queued_user_input() {
|
||||
}])
|
||||
.await
|
||||
.unwrap();
|
||||
let user_input = vec![UserInput::Text {
|
||||
text: "keep this queued user input".to_string(),
|
||||
text_elements: Vec::new(),
|
||||
}];
|
||||
let user_input = vec![ResolvedUserInput::text(
|
||||
"keep this queued user input".to_string(),
|
||||
)];
|
||||
assert!(matches!(
|
||||
submit_steer_only(&session, user_input.clone(), &turn.sub_id).await,
|
||||
TurnInputSubmission::Steered { .. }
|
||||
@@ -78,7 +77,7 @@ async fn task_finish_preserves_notification_budget_and_queued_user_input() {
|
||||
&text,
|
||||
codex_utils_output_truncation::TruncationPolicy::Tokens(120),
|
||||
)),
|
||||
session.response_item_from_user_input(user_input),
|
||||
session.response_item_from_user_input(&user_input),
|
||||
late[0].clone(),
|
||||
];
|
||||
let history = session.clone_history().await;
|
||||
|
||||
@@ -143,11 +143,7 @@ pub(super) async fn spawn_review_thread(
|
||||
// Seed the child task with the review prompt as the initial user message.
|
||||
let input = vec![TurnInput::UserInput {
|
||||
metadata: Default::default(),
|
||||
content: vec![UserInput::Text {
|
||||
text: review_prompt,
|
||||
// Review prompt is synthesized; no UI element ranges to preserve.
|
||||
text_elements: Vec::new(),
|
||||
}],
|
||||
content: vec![ResolvedUserInput::text(review_prompt)],
|
||||
client_id: None,
|
||||
}];
|
||||
let tc = Arc::new(review_turn_context);
|
||||
|
||||
@@ -518,7 +518,8 @@ fn settings_submission(
|
||||
turn_id: turn_id.to_string(),
|
||||
update,
|
||||
reply,
|
||||
},
|
||||
}
|
||||
.into(),
|
||||
trace: None,
|
||||
parent_turn_id: None,
|
||||
root_turn_id: None,
|
||||
|
||||
@@ -1,14 +1,64 @@
|
||||
//! Core-owned queue metadata; forwarding transfers the residency guard with the operation.
|
||||
|
||||
use codex_extension_api::ExtensionDataInit;
|
||||
use codex_protocol::error::Result as CodexResult;
|
||||
use codex_protocol::protocol::Op;
|
||||
use codex_protocol::protocol::W3cTraceContext;
|
||||
use codex_protocol::turn_input::TurnInputMode;
|
||||
use codex_protocol::turn_input::TurnInputRequest;
|
||||
use codex_protocol::turn_input::TurnInputSubmission;
|
||||
use codex_user_input::ResolvedUserInput;
|
||||
use tokio::sync::OwnedRwLockReadGuard;
|
||||
use tokio::sync::oneshot;
|
||||
|
||||
/// Turn input crosses this queue only after the submitting host has resolved its attachments.
|
||||
pub(crate) enum SubmissionOp {
|
||||
Protocol(Box<Op>),
|
||||
TurnInput {
|
||||
request: Box<TurnInputRequest<ResolvedUserInput>>,
|
||||
mode: TurnInputMode,
|
||||
reply: oneshot::Sender<CodexResult<TurnInputSubmission>>,
|
||||
},
|
||||
}
|
||||
|
||||
impl From<Op> for SubmissionOp {
|
||||
fn from(op: Op) -> Self {
|
||||
Self::Protocol(Box::new(op))
|
||||
}
|
||||
}
|
||||
|
||||
impl SubmissionOp {
|
||||
pub(crate) fn as_protocol(&self) -> Option<&Op> {
|
||||
match self {
|
||||
Self::Protocol(op) => Some(op),
|
||||
Self::TurnInput { .. } => None,
|
||||
}
|
||||
}
|
||||
|
||||
pub(super) fn kind(&self) -> &'static str {
|
||||
match self {
|
||||
Self::Protocol(op) => op.kind(),
|
||||
Self::TurnInput { .. } => "turn_input",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl std::fmt::Debug for SubmissionOp {
|
||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||
match self {
|
||||
Self::Protocol(op) => std::fmt::Debug::fmt(op, f),
|
||||
Self::TurnInput { request, .. } => f
|
||||
.debug_struct("TurnInput")
|
||||
.field("requested_settings", &request.thread_settings)
|
||||
.finish(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub(crate) struct Submission {
|
||||
pub id: String,
|
||||
pub op: Op,
|
||||
pub op: SubmissionOp,
|
||||
/// Accepted with settings, never separately from the request that supplied them.
|
||||
pub turn_extension_init: Option<ExtensionDataInit>,
|
||||
/// Optional W3C trace carrier propagated across async submission handoffs.
|
||||
|
||||
@@ -6155,7 +6155,8 @@ async fn standalone_settings_invalidate_continuation_before_delivering_acceptanc
|
||||
op: Op::ThreadSettings {
|
||||
thread_settings: ThreadSettingsOverrides::default(),
|
||||
reply: Some(reply),
|
||||
},
|
||||
}
|
||||
.into(),
|
||||
trace: None,
|
||||
parent_turn_id: None,
|
||||
root_turn_id: None,
|
||||
@@ -8250,7 +8251,7 @@ fn submission_dispatch_span_prefers_submission_trace_context() {
|
||||
submission_dispatch_span(&Submission {
|
||||
turn_extension_init: None,
|
||||
id: "sub-1".into(),
|
||||
op: Op::Interrupt,
|
||||
op: Op::Interrupt.into(),
|
||||
parent_turn_id: None,
|
||||
root_turn_id: None,
|
||||
residency_guard: None,
|
||||
@@ -8281,7 +8282,8 @@ fn submission_dispatch_span_uses_debug_for_realtime_audio() {
|
||||
samples_per_channel: Some(160),
|
||||
item_id: None,
|
||||
},
|
||||
}),
|
||||
})
|
||||
.into(),
|
||||
parent_turn_id: None,
|
||||
root_turn_id: None,
|
||||
residency_guard: None,
|
||||
@@ -8644,7 +8646,7 @@ async fn spawn_task_turn_span_inherits_dispatch_trace_context() {
|
||||
let dispatch_span = submission_dispatch_span(&Submission {
|
||||
turn_extension_init: None,
|
||||
id: "sub-1".into(),
|
||||
op: Op::Interrupt,
|
||||
op: Op::Interrupt.into(),
|
||||
parent_turn_id: None,
|
||||
root_turn_id: None,
|
||||
residency_guard: None,
|
||||
@@ -8660,10 +8662,7 @@ async fn spawn_task_turn_span_inherits_dispatch_trace_context() {
|
||||
Arc::clone(&tc),
|
||||
vec![TurnInput::UserInput {
|
||||
metadata: Default::default(),
|
||||
content: vec![UserInput::Text {
|
||||
text: "hello".to_string(),
|
||||
text_elements: Vec::new(),
|
||||
}],
|
||||
content: vec![ResolvedUserInput::text("hello".to_string())],
|
||||
client_id: None,
|
||||
}],
|
||||
TraceCaptureTask {
|
||||
@@ -9016,7 +9015,7 @@ async fn shutdown_and_wait_allows_multiple_waiters() {
|
||||
let (_tx_event, rx_event) = async_channel::unbounded();
|
||||
let session_loop_handle = tokio::spawn(async move {
|
||||
let shutdown = rx_sub.recv().await.expect("shutdown submission");
|
||||
assert!(matches!(shutdown.op, Op::Shutdown));
|
||||
assert!(matches!(shutdown.op.as_protocol(), Some(Op::Shutdown)));
|
||||
tokio::time::sleep(StdDuration::from_millis(50)).await;
|
||||
});
|
||||
let io = Arc::new(SessionIo {
|
||||
@@ -10419,10 +10418,7 @@ async fn spawn_task_does_not_update_previous_turn_settings_for_non_run_turn_task
|
||||
.await;
|
||||
let input = vec![TurnInput::UserInput {
|
||||
metadata: Default::default(),
|
||||
content: vec![UserInput::Text {
|
||||
text: "hello".to_string(),
|
||||
text_elements: Vec::new(),
|
||||
}],
|
||||
content: vec![ResolvedUserInput::text("hello".to_string())],
|
||||
client_id: None,
|
||||
}];
|
||||
|
||||
@@ -12373,10 +12369,9 @@ async fn extension_interrupt_survives_the_calling_runtime() {
|
||||
let (sess, tc, rx) = make_session_and_context_with_rx().await;
|
||||
let input = vec![TurnInput::UserInput {
|
||||
metadata: Default::default(),
|
||||
content: vec![UserInput::Text {
|
||||
text: "keep turn active for extension interruption".to_string(),
|
||||
text_elements: Vec::new(),
|
||||
}],
|
||||
content: vec![ResolvedUserInput::text(
|
||||
"keep turn active for extension interruption".to_string(),
|
||||
)],
|
||||
client_id: None,
|
||||
}];
|
||||
sess.spawn_task(
|
||||
@@ -12438,10 +12433,7 @@ async fn turn_complete_flushes_terminal_event_after_delivery() {
|
||||
|
||||
let input = vec![TurnInput::UserInput {
|
||||
metadata: Default::default(),
|
||||
content: vec![UserInput::Text {
|
||||
text: "complete normally".to_string(),
|
||||
text_elements: Vec::new(),
|
||||
}],
|
||||
content: vec![ResolvedUserInput::text("complete normally".to_string())],
|
||||
client_id: None,
|
||||
}];
|
||||
sess.spawn_task(Arc::clone(&tc), input, CompletingTask)
|
||||
@@ -12466,10 +12458,7 @@ async fn turn_aborted_flushes_terminal_event_after_delivery() {
|
||||
|
||||
let input = vec![TurnInput::UserInput {
|
||||
metadata: Default::default(),
|
||||
content: vec![UserInput::Text {
|
||||
text: "interrupt me".to_string(),
|
||||
text_elements: Vec::new(),
|
||||
}],
|
||||
content: vec![ResolvedUserInput::text("interrupt me".to_string())],
|
||||
client_id: None,
|
||||
}];
|
||||
sess.spawn_task(
|
||||
@@ -12509,10 +12498,7 @@ async fn abort_regular_task_emits_marker_before_turn_aborted() {
|
||||
let (sess, tc, rx) = make_session_and_context_with_rx().await;
|
||||
let input = vec![TurnInput::UserInput {
|
||||
metadata: Default::default(),
|
||||
content: vec![UserInput::Text {
|
||||
text: "hello".to_string(),
|
||||
text_elements: Vec::new(),
|
||||
}],
|
||||
content: vec![ResolvedUserInput::text("hello".to_string())],
|
||||
client_id: None,
|
||||
}];
|
||||
sess.spawn_task(
|
||||
@@ -12551,10 +12537,7 @@ async fn abort_gracefully_emits_marker_before_turn_aborted() {
|
||||
let (sess, tc, rx) = make_session_and_context_with_rx().await;
|
||||
let input = vec![TurnInput::UserInput {
|
||||
metadata: Default::default(),
|
||||
content: vec![UserInput::Text {
|
||||
text: "hello".to_string(),
|
||||
text_elements: Vec::new(),
|
||||
}],
|
||||
content: vec![ResolvedUserInput::text("hello".to_string())],
|
||||
client_id: None,
|
||||
}];
|
||||
sess.spawn_task(
|
||||
@@ -12590,7 +12573,7 @@ async fn abort_gracefully_emits_marker_before_turn_aborted() {
|
||||
|
||||
async fn submit_steer_only(
|
||||
sess: &Arc<Session>,
|
||||
input: Vec<UserInput>,
|
||||
input: Vec<ResolvedUserInput>,
|
||||
expected_turn_id: &str,
|
||||
) -> TurnInputSubmission {
|
||||
super::turn_input::handle(
|
||||
@@ -12628,10 +12611,7 @@ async fn task_finish_emits_turn_item_lifecycle_for_leftover_pending_user_input()
|
||||
);
|
||||
let input = vec![TurnInput::UserInput {
|
||||
metadata: Default::default(),
|
||||
content: vec![UserInput::Text {
|
||||
text: "hello".to_string(),
|
||||
text_elements: Vec::new(),
|
||||
}],
|
||||
content: vec![ResolvedUserInput::text("hello".to_string())],
|
||||
client_id: None,
|
||||
}];
|
||||
sess.spawn_task(
|
||||
@@ -12667,7 +12647,16 @@ async fn task_finish_emits_turn_item_lifecycle_for_leftover_pending_user_input()
|
||||
detail: Some(ImageDetail::High),
|
||||
},
|
||||
];
|
||||
let submission = submit_steer_only(&sess, pending_user_input.clone(), &tc.sub_id).await;
|
||||
let submission = submit_steer_only(
|
||||
&sess,
|
||||
pending_user_input
|
||||
.iter()
|
||||
.cloned()
|
||||
.map(ResolvedUserInput::from_client)
|
||||
.collect(),
|
||||
&tc.sub_id,
|
||||
)
|
||||
.await;
|
||||
assert!(matches!(submission, TurnInputSubmission::Steered { .. }));
|
||||
|
||||
let mut current = tc.initial_settings.as_ref().clone();
|
||||
@@ -13094,10 +13083,7 @@ async fn steered_input_reopens_mailbox_delivery_for_current_turn() {
|
||||
.await;
|
||||
let submission = submit_steer_only(
|
||||
&sess,
|
||||
vec![UserInput::Text {
|
||||
text: "follow up".to_string(),
|
||||
text_elements: Vec::new(),
|
||||
}],
|
||||
vec![ResolvedUserInput::text("follow up".to_string())],
|
||||
&tc.sub_id,
|
||||
)
|
||||
.await;
|
||||
@@ -13111,10 +13097,7 @@ async fn steered_input_reopens_mailbox_delivery_for_current_turn() {
|
||||
acceptance_order: Some(0),
|
||||
..Default::default()
|
||||
},
|
||||
content: vec![UserInput::Text {
|
||||
text: "follow up".to_string(),
|
||||
text_elements: Vec::new(),
|
||||
}],
|
||||
content: vec![ResolvedUserInput::text("follow up".to_string())],
|
||||
client_id: None,
|
||||
},
|
||||
TurnInput::InterAgentCommunication(communication.into()),
|
||||
@@ -13150,10 +13133,7 @@ async fn stale_defer_mailbox_delivery_does_not_override_steered_input() {
|
||||
.await;
|
||||
let submission = submit_steer_only(
|
||||
&sess,
|
||||
vec![UserInput::Text {
|
||||
text: "follow up".to_string(),
|
||||
text_elements: Vec::new(),
|
||||
}],
|
||||
vec![ResolvedUserInput::text("follow up".to_string())],
|
||||
&tc.sub_id,
|
||||
)
|
||||
.await;
|
||||
@@ -13171,10 +13151,7 @@ async fn stale_defer_mailbox_delivery_does_not_override_steered_input() {
|
||||
acceptance_order: Some(0),
|
||||
..Default::default()
|
||||
},
|
||||
content: vec![UserInput::Text {
|
||||
text: "follow up".to_string(),
|
||||
text_elements: Vec::new(),
|
||||
}],
|
||||
content: vec![ResolvedUserInput::text("follow up".to_string())],
|
||||
client_id: None,
|
||||
},
|
||||
TurnInput::InterAgentCommunication(communication.into()),
|
||||
@@ -13247,10 +13224,7 @@ async fn abort_review_task_emits_exited_then_aborted_and_records_history() {
|
||||
let (sess, tc, rx) = make_session_and_context_with_rx().await;
|
||||
let input = vec![TurnInput::UserInput {
|
||||
metadata: Default::default(),
|
||||
content: vec![UserInput::Text {
|
||||
text: "start review".to_string(),
|
||||
text_elements: Vec::new(),
|
||||
}],
|
||||
content: vec![ResolvedUserInput::text("start review".to_string())],
|
||||
client_id: None,
|
||||
}];
|
||||
sess.spawn_task(Arc::clone(&tc), input, ReviewTask::new())
|
||||
|
||||
@@ -102,7 +102,6 @@ use codex_protocol::error::Result as CodexResult;
|
||||
use codex_protocol::items::PlanItem;
|
||||
use codex_protocol::items::TurnItem;
|
||||
use codex_protocol::items::build_hook_prompt_message;
|
||||
use codex_protocol::models::AudioReference;
|
||||
use codex_protocol::models::BaseInstructions;
|
||||
use codex_protocol::models::ContentItem;
|
||||
use codex_protocol::models::MessagePhase;
|
||||
@@ -136,6 +135,7 @@ use codex_tools::DiscoverableTool;
|
||||
use codex_tools::ToolName;
|
||||
use codex_tools::ToolSpec;
|
||||
use codex_tools::filter_request_plugin_install_discoverable_tools_for_client;
|
||||
use codex_user_input::ResolvedUserInput;
|
||||
use codex_utils_path_uri::PathUri;
|
||||
use codex_utils_stream_parser::AssistantTextChunk;
|
||||
use codex_utils_stream_parser::AssistantTextStreamParser;
|
||||
@@ -303,7 +303,7 @@ pub(crate) async fn run_turn(
|
||||
return Ok(None);
|
||||
}
|
||||
|
||||
let user_input = turn_user_input(&input);
|
||||
let user_input = input_for_extensions(&input);
|
||||
let allow_plugin_mentions =
|
||||
!crate::guardian::is_basic_session_source(&turn_context.session_source);
|
||||
let McpStartupRequirements {
|
||||
@@ -594,7 +594,7 @@ pub(crate) async fn run_turn(
|
||||
.await?
|
||||
}
|
||||
Some(_) | None => {
|
||||
let pending_user_input = turn_user_input(&pending_input);
|
||||
let pending_user_input = input_for_extensions(&pending_input);
|
||||
if allow_plugin_mentions {
|
||||
required_plugins.extend(crate::plugins::collect_explicit_plugin_ids(
|
||||
&pending_user_input,
|
||||
@@ -1169,7 +1169,7 @@ pub(crate) fn recordable_inputs<'a>(
|
||||
&& turn_input_has_uploaded_audio_file(&item)
|
||||
&& let TurnInput::UserInput { content, .. } = item.to_mut()
|
||||
{
|
||||
content.retain(|part| !is_uploaded_audio_file(part));
|
||||
content.retain(|part| !part.is_uploaded_audio_file());
|
||||
if content.is_empty() {
|
||||
return None;
|
||||
}
|
||||
@@ -1180,7 +1180,7 @@ pub(crate) fn recordable_inputs<'a>(
|
||||
}
|
||||
|
||||
fn turn_input_has_uploaded_audio_file(input: &TurnInput) -> bool {
|
||||
matches!(input, TurnInput::UserInput { content, .. } if content.iter().any(is_uploaded_audio_file))
|
||||
matches!(input, TurnInput::UserInput { content, .. } if content.iter().any(ResolvedUserInput::is_uploaded_audio_file))
|
||||
}
|
||||
|
||||
fn unsupported_uploaded_audio_error() -> CodexErr {
|
||||
@@ -1189,16 +1189,8 @@ fn unsupported_uploaded_audio_error() -> CodexErr {
|
||||
)
|
||||
}
|
||||
|
||||
fn is_uploaded_audio_file(input: &UserInput) -> bool {
|
||||
matches!(
|
||||
input,
|
||||
UserInput::Audio {
|
||||
audio: AudioReference::File { .. }
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
pub(crate) fn turn_user_input(input: &[TurnInput]) -> Vec<UserInput> {
|
||||
/// Extensions and telemetry consume the protocol view, including the original mention and path labels.
|
||||
fn input_for_extensions(input: &[TurnInput]) -> Vec<UserInput> {
|
||||
input
|
||||
.iter()
|
||||
.filter_map(|item| match item {
|
||||
@@ -1208,7 +1200,7 @@ pub(crate) fn turn_user_input(input: &[TurnInput]) -> Vec<UserInput> {
|
||||
| TurnInput::InterAgentCommunication(_) => None,
|
||||
})
|
||||
.flatten()
|
||||
.cloned()
|
||||
.map(ResolvedUserInput::to_user_input)
|
||||
.collect()
|
||||
}
|
||||
|
||||
@@ -1568,9 +1560,7 @@ async fn track_turn_resolved_config_analytics(
|
||||
| TurnInput::InterAgentCommunication(_) => None,
|
||||
})
|
||||
.flatten()
|
||||
.filter(|item| {
|
||||
matches!(item, UserInput::Image { .. } | UserInput::LocalImage { .. })
|
||||
})
|
||||
.filter(|item| item.is_image())
|
||||
.count(),
|
||||
submission_type: None,
|
||||
ephemeral: thread_config.ephemeral,
|
||||
|
||||
@@ -51,12 +51,12 @@ use codex_protocol::protocol::ThreadSettingsOverrides;
|
||||
use codex_protocol::turn_input::AnnotatedResponseItem;
|
||||
use codex_protocol::turn_input::NotSubmittedReason;
|
||||
use codex_protocol::turn_input::ResponsesApiClientMetadataUpdate;
|
||||
use codex_protocol::turn_input::TurnInput as SubmittedTurnInput;
|
||||
type SubmittedTurnInput = codex_protocol::turn_input::TurnInput<ResolvedUserInput>;
|
||||
use codex_protocol::turn_input::TurnInputMode;
|
||||
use codex_protocol::turn_input::TurnInputRequest;
|
||||
type TurnInputRequest = codex_protocol::turn_input::TurnInputRequest<ResolvedUserInput>;
|
||||
use codex_protocol::turn_input::TurnInputSubmission;
|
||||
use codex_protocol::turn_input::TurnStartOptions;
|
||||
use codex_protocol::user_input::UserInput;
|
||||
use codex_user_input::ResolvedUserInput;
|
||||
use serde_json::Value;
|
||||
use std::collections::BTreeMap;
|
||||
use std::sync::Arc;
|
||||
@@ -926,14 +926,12 @@ impl Session {
|
||||
let submission_id = Uuid::now_v7().to_string();
|
||||
let submission = handle(
|
||||
self,
|
||||
TurnInputRequest::user_input(vec![UserInput::Text {
|
||||
text,
|
||||
text_elements: Vec::new(),
|
||||
}])
|
||||
.on_start(TurnStartOptions {
|
||||
turn_trigger: Some("realtime".to_string()),
|
||||
..Default::default()
|
||||
}),
|
||||
TurnInputRequest::user_input(vec![ResolvedUserInput::text(text)]).on_start(
|
||||
TurnStartOptions {
|
||||
turn_trigger: Some("realtime".to_string()),
|
||||
..Default::default()
|
||||
},
|
||||
),
|
||||
TurnInputMode::StartOrSteer,
|
||||
submission_id.clone(),
|
||||
)
|
||||
|
||||
@@ -11,7 +11,8 @@ use crate::session::session::Session;
|
||||
use codex_protocol::error::Result as CodexResult;
|
||||
use codex_protocol::turn_input::NotSubmittedReason;
|
||||
use codex_protocol::turn_input::TurnInput;
|
||||
use codex_protocol::turn_input::TurnInputRequest;
|
||||
type TurnInputRequest =
|
||||
codex_protocol::turn_input::TurnInputRequest<codex_user_input::ResolvedUserInput>;
|
||||
use codex_protocol::turn_input::TurnInputSubmission;
|
||||
use std::sync::Arc;
|
||||
|
||||
|
||||
@@ -22,8 +22,7 @@ use codex_protocol::protocol::AskForApproval;
|
||||
use codex_protocol::protocol::InterAgentCommunication;
|
||||
use codex_protocol::protocol::ThreadSettingsOverrides;
|
||||
use codex_protocol::protocol::TurnAbortReason;
|
||||
use codex_protocol::turn_input::TurnInput as SubmittedTurnInput;
|
||||
use codex_protocol::user_input::UserInput;
|
||||
use codex_user_input::ResolvedUserInput;
|
||||
use codex_utils_absolute_path::AbsolutePathBuf;
|
||||
use core_test_support::test_codex::local_selections;
|
||||
use pretty_assertions::assert_eq;
|
||||
@@ -93,7 +92,7 @@ async fn submit_start_only(
|
||||
|
||||
async fn submit_steer_only(
|
||||
session: &Arc<Session>,
|
||||
input: Vec<UserInput>,
|
||||
input: Vec<ResolvedUserInput>,
|
||||
expected_turn_id: &str,
|
||||
) -> TurnInputSubmission {
|
||||
handle(
|
||||
@@ -148,10 +147,9 @@ async fn steering_does_not_wait_for_realtime_history() {
|
||||
std::time::Duration::from_secs(5),
|
||||
handle(
|
||||
&session,
|
||||
TurnInputRequest::user_input(vec![UserInput::Text {
|
||||
text: "steer without waiting for persistence".to_string(),
|
||||
text_elements: Vec::new(),
|
||||
}]),
|
||||
TurnInputRequest::user_input(vec![ResolvedUserInput::text(
|
||||
"steer without waiting for persistence".to_string(),
|
||||
)]),
|
||||
mode,
|
||||
"steer-submission".to_string(),
|
||||
),
|
||||
@@ -177,27 +175,24 @@ async fn accepted_input_applies_thread_settings() {
|
||||
let config = session.get_config().await;
|
||||
handle(
|
||||
&session,
|
||||
TurnInputRequest::user_input(vec![UserInput::Text {
|
||||
text: "hello".to_string(),
|
||||
text_elements: Vec::new(),
|
||||
}])
|
||||
.with_thread_settings(ThreadSettingsOverrides {
|
||||
environments: Some(local_selections(config.cwd.clone()).into_requests()),
|
||||
approval_policy: Some(config.permissions.approval_policy.value()),
|
||||
approvals_reviewer: Some(codex_config::types::ApprovalsReviewer::AutoReview),
|
||||
permission_profile: Some(config.permissions.effective_permission_profile()),
|
||||
summary: config.model_reasoning_summary,
|
||||
personality: config.personality,
|
||||
collaboration_mode: Some(CollaborationMode {
|
||||
mode: ModeKind::Default,
|
||||
settings: Settings {
|
||||
model: turn_context.model_info().slug.clone(),
|
||||
reasoning_effort: config.model_reasoning_effort.clone(),
|
||||
developer_instructions: None,
|
||||
},
|
||||
TurnInputRequest::user_input(vec![ResolvedUserInput::text("hello".to_string())])
|
||||
.with_thread_settings(ThreadSettingsOverrides {
|
||||
environments: Some(local_selections(config.cwd.clone()).into_requests()),
|
||||
approval_policy: Some(config.permissions.approval_policy.value()),
|
||||
approvals_reviewer: Some(codex_config::types::ApprovalsReviewer::AutoReview),
|
||||
permission_profile: Some(config.permissions.effective_permission_profile()),
|
||||
summary: config.model_reasoning_summary,
|
||||
personality: config.personality,
|
||||
collaboration_mode: Some(CollaborationMode {
|
||||
mode: ModeKind::Default,
|
||||
settings: Settings {
|
||||
model: turn_context.model_info().slug.clone(),
|
||||
reasoning_effort: config.model_reasoning_effort.clone(),
|
||||
developer_instructions: None,
|
||||
},
|
||||
}),
|
||||
..Default::default()
|
||||
}),
|
||||
..Default::default()
|
||||
}),
|
||||
TurnInputMode::StartOrSteer,
|
||||
"sub-1".to_string(),
|
||||
)
|
||||
@@ -787,10 +782,7 @@ async fn start_only_accepts_user_input_in_plan_mode() {
|
||||
let submission = submit_start_only(
|
||||
&session,
|
||||
SubmittedTurnInput::UserInput {
|
||||
content: vec![UserInput::Text {
|
||||
text: "queued user input".to_string(),
|
||||
text_elements: Vec::new(),
|
||||
}],
|
||||
content: vec![ResolvedUserInput::text("queued user input".to_string())],
|
||||
client_id: Some("queued-user-message".to_string()),
|
||||
},
|
||||
)
|
||||
@@ -928,10 +920,7 @@ async fn steer_only_requires_active_turn() {
|
||||
let (session, _turn_context, _rx) = make_session_and_context_with_rx().await;
|
||||
let submission = submit_steer_only(
|
||||
&session,
|
||||
vec![UserInput::Text {
|
||||
text: "steer".to_string(),
|
||||
text_elements: Vec::new(),
|
||||
}],
|
||||
vec![ResolvedUserInput::text("steer".to_string())],
|
||||
"missing-turn-id",
|
||||
)
|
||||
.await;
|
||||
@@ -955,10 +944,7 @@ async fn steer_only_enforces_expected_turn_id() {
|
||||
Arc::clone(&turn_context),
|
||||
vec![TurnInput::UserInput {
|
||||
metadata: Default::default(),
|
||||
content: vec![UserInput::Text {
|
||||
text: "hello".to_string(),
|
||||
text_elements: Vec::new(),
|
||||
}],
|
||||
content: vec![ResolvedUserInput::text("hello".to_string())],
|
||||
client_id: None,
|
||||
}],
|
||||
NeverEndingTask {
|
||||
@@ -970,10 +956,7 @@ async fn steer_only_enforces_expected_turn_id() {
|
||||
|
||||
let submission = submit_steer_only(
|
||||
&session,
|
||||
vec![UserInput::Text {
|
||||
text: "steer".to_string(),
|
||||
text_elements: Vec::new(),
|
||||
}],
|
||||
vec![ResolvedUserInput::text("steer".to_string())],
|
||||
"different-turn-id",
|
||||
)
|
||||
.await;
|
||||
@@ -1059,10 +1042,7 @@ async fn rejects_non_regular_turns() {
|
||||
Arc::clone(&turn_context),
|
||||
vec![TurnInput::UserInput {
|
||||
metadata: Default::default(),
|
||||
content: vec![UserInput::Text {
|
||||
text: "hello".to_string(),
|
||||
text_elements: Vec::new(),
|
||||
}],
|
||||
content: vec![ResolvedUserInput::text("hello".to_string())],
|
||||
client_id: None,
|
||||
}],
|
||||
NeverEndingTask {
|
||||
@@ -1072,10 +1052,7 @@ async fn rejects_non_regular_turns() {
|
||||
)
|
||||
.await;
|
||||
|
||||
let steer_input = vec![UserInput::Text {
|
||||
text: "steer".to_string(),
|
||||
text_elements: Vec::new(),
|
||||
}];
|
||||
let steer_input = vec![ResolvedUserInput::text("steer".to_string())];
|
||||
let steer_submission = submit_steer_only(&session, steer_input.clone(), "turn").await;
|
||||
assert_eq!(
|
||||
TurnInputSubmission::NotSubmitted {
|
||||
@@ -1128,10 +1105,9 @@ async fn steer_preserves_request_origin(
|
||||
},
|
||||
)
|
||||
.await;
|
||||
let content = vec![UserInput::Text {
|
||||
text: "Create the worktree now.".to_owned(),
|
||||
text_elements: Vec::new(),
|
||||
}];
|
||||
let content = vec![ResolvedUserInput::text(
|
||||
"Create the worktree now.".to_owned(),
|
||||
)];
|
||||
handle(
|
||||
&session,
|
||||
TurnInputRequest::user_input(content.clone()).on_start(TurnStartOptions {
|
||||
@@ -1210,10 +1186,7 @@ async fn scored_prompt_keeps_its_submission_item_id() {
|
||||
// A legacy steer can present the same UI client ID as an admitted steer.
|
||||
for id in [Some(first), None, Some(second)] {
|
||||
let mut request = TurnInputRequest::new(SubmittedTurnInput::UserInput {
|
||||
content: vec![UserInput::Text {
|
||||
text: "identical input".into(),
|
||||
text_elements: vec![],
|
||||
}],
|
||||
content: vec![ResolvedUserInput::text("identical input".into())],
|
||||
client_id: Some("same-client-id".into()),
|
||||
});
|
||||
request.user_item_uuid = id;
|
||||
|
||||
Reference in New Issue
Block a user