[codex-analytics] add queued submission metadata

This commit is contained in:
rhan-oai
2026-04-06 13:13:44 -07:00
parent 472c15a74b
commit 59cfda78e2
58 changed files with 586 additions and 7 deletions
+2
View File
@@ -2231,6 +2231,7 @@ impl App {
final_output_json_schema,
collaboration_mode,
personality,
submission_type,
} => {
let mut should_start_turn = true;
if let Some(turn_id) = self.active_turn_id_for_thread(thread_id).await {
@@ -2313,6 +2314,7 @@ impl App {
*service_tier,
collaboration_mode.clone(),
*personality,
*submission_type,
final_output_json_schema.clone(),
)
.await?;
+6
View File
@@ -17,6 +17,7 @@ use codex_protocol::protocol::Op;
use codex_protocol::protocol::ReviewDecision;
use codex_protocol::protocol::ReviewRequest;
use codex_protocol::protocol::SandboxPolicy;
use codex_protocol::protocol::SubmissionType;
use codex_protocol::request_permissions::RequestPermissionsResponse;
use codex_protocol::request_user_input::RequestUserInputResponse;
use codex_protocol::user_input::UserInput;
@@ -51,6 +52,7 @@ pub(crate) enum AppCommandView<'a> {
final_output_json_schema: &'a Option<Value>,
collaboration_mode: &'a Option<CollaborationMode>,
personality: &'a Option<Personality>,
submission_type: &'a Option<SubmissionType>,
},
OverrideTurnContext {
cwd: &'a Option<PathBuf>,
@@ -152,6 +154,7 @@ impl AppCommand {
final_output_json_schema: Option<Value>,
collaboration_mode: Option<CollaborationMode>,
personality: Option<Personality>,
submission_type: Option<SubmissionType>,
) -> Self {
Self(Op::UserTurn {
items,
@@ -166,6 +169,7 @@ impl AppCommand {
final_output_json_schema,
collaboration_mode,
personality,
submission_type,
})
}
@@ -311,6 +315,7 @@ impl AppCommand {
final_output_json_schema,
collaboration_mode,
personality,
submission_type,
} => AppCommandView::UserTurn {
items,
cwd,
@@ -324,6 +329,7 @@ impl AppCommand {
final_output_json_schema,
collaboration_mode,
personality,
submission_type,
},
Op::OverrideTurnContext {
cwd,
+3
View File
@@ -82,6 +82,7 @@ use codex_protocol::protocol::ReviewRequest;
use codex_protocol::protocol::ReviewTarget as CoreReviewTarget;
use codex_protocol::protocol::SandboxPolicy;
use codex_protocol::protocol::SessionNetworkProxyRuntime;
use codex_protocol::protocol::SubmissionType;
use color_eyre::eyre::ContextCompat;
use color_eyre::eyre::Result;
use color_eyre::eyre::WrapErr;
@@ -425,6 +426,7 @@ impl AppServerSession {
service_tier: Option<Option<codex_protocol::config_types::ServiceTier>>,
collaboration_mode: Option<codex_protocol::config_types::CollaborationMode>,
personality: Option<codex_protocol::config_types::Personality>,
submission_type: Option<SubmissionType>,
output_schema: Option<serde_json::Value>,
) -> Result<TurnStartResponse> {
let request_id = self.next_request_id();
@@ -443,6 +445,7 @@ impl AppServerSession {
effort,
summary,
personality,
submission_type,
output_schema,
collaboration_mode,
},
+16 -1
View File
@@ -193,6 +193,7 @@ use codex_protocol::protocol::ReviewTarget;
use codex_protocol::protocol::SkillMetadata as ProtocolSkillMetadata;
#[cfg(test)]
use codex_protocol::protocol::StreamErrorEvent;
use codex_protocol::protocol::SubmissionType;
use codex_protocol::protocol::TerminalInteractionEvent;
use codex_protocol::protocol::TokenUsage;
use codex_protocol::protocol::TokenUsageInfo;
@@ -5567,6 +5568,14 @@ impl ChatWidget {
}
fn submit_user_message(&mut self, user_message: UserMessage) {
self.submit_user_message_with_type(user_message, /*submission_type*/ None);
}
fn submit_user_message_with_type(
&mut self,
user_message: UserMessage,
submission_type: Option<SubmissionType>,
) {
if !self.is_session_configured() {
tracing::warn!("cannot submit user message before session is configured; queueing");
self.queued_user_messages.push_front(user_message);
@@ -5782,6 +5791,7 @@ impl ChatWidget {
/*final_output_json_schema*/ None,
collaboration_mode,
personality,
submission_type,
);
if !self.submit_op(op) {
@@ -7243,8 +7253,13 @@ impl ChatWidget {
if self.bottom_pane.is_task_running() {
return;
}
let submission_type = if self.rejected_steers_queue.is_empty() {
Some(SubmissionType::PromptQueued)
} else {
None
};
if let Some(user_message) = self.pop_next_queued_user_message() {
self.submit_user_message(user_message);
self.submit_user_message_with_type(user_message, submission_type);
}
// Update the list to reflect the remaining queued messages (if any).
self.refresh_pending_input_preview();
@@ -642,6 +642,29 @@ async fn interrupted_turn_restore_keeps_active_mode_for_resubmission() {
assert_eq!(chat.active_collaboration_mode_kind(), expected_mode);
}
#[tokio::test]
async fn queued_user_message_marks_prompt_queued_submission_type() {
let (mut chat, _rx, mut op_rx) = make_chatwidget_manual(Some("gpt-5")).await;
chat.thread_id = Some(ThreadId::new());
chat.queued_user_messages.push_back(UserMessage {
text: "queued follow up".to_string(),
local_images: Vec::new(),
remote_image_urls: Vec::new(),
text_elements: Vec::new(),
mention_bindings: Vec::new(),
});
chat.maybe_send_next_queued_input();
match next_submit_op(&mut op_rx) {
Op::UserTurn {
submission_type: Some(SubmissionType::PromptQueued),
..
} => {}
other => panic!("expected queued prompt submission, got {other:?}"),
}
}
#[tokio::test]
async fn remap_placeholders_uses_attachment_labels() {
let placeholder_one = "[Image #1]";