define events and support queueing

This commit is contained in:
Roy Han
2026-03-24 17:26:15 -07:00
parent 07c0d34fa4
commit 8a6be13ae6
10 changed files with 74 additions and 44 deletions
+15 -14
View File
@@ -34,6 +34,7 @@ pub(crate) struct TrackEventsContext {
#[derive(Clone)]
pub(crate) struct TurnMetadata {
pub(crate) turn_type: Option<TurnType>,
pub(crate) model_provider: String,
pub(crate) sandbox_policy: SandboxPolicy,
pub(crate) reasoning_effort: Option<ReasoningEffort>,
@@ -47,16 +48,16 @@ pub(crate) struct TurnMetadata {
pub(crate) num_input_images: usize,
}
#[derive(Clone, Copy)]
pub(crate) struct InputMessageMetadata {
pub(crate) message_role: InputMessageRole,
pub(crate) user_message_type: UserMessageType,
}
#[derive(Clone, Copy, Debug, Serialize)]
#[serde(rename_all = "snake_case")]
pub(crate) enum InputMessageRole {
User,
pub(crate) enum TurnType {
Prompt,
PromptQueued,
}
#[derive(Clone, Copy)]
pub(crate) struct UserMessageMetadata {
pub(crate) user_message_type: UserMessageType,
}
pub(crate) fn build_track_events_context(
@@ -255,7 +256,7 @@ impl AnalyticsEventsClient {
pub(crate) fn track_input_message_metadata(
&self,
tracking: TrackEventsContext,
input_message_metadata: InputMessageMetadata,
input_message_metadata: UserMessageMetadata,
) {
track_input_message_metadata(
&self.queue,
@@ -342,7 +343,7 @@ struct TrackTurnMetadataJob {
struct TrackInputMessageMetadataJob {
config: Arc<Config>,
tracking: TrackEventsContext,
input_message_metadata: InputMessageMetadata,
input_message_metadata: UserMessageMetadata,
}
struct TrackPluginUsedJob {
@@ -435,6 +436,7 @@ struct CodexTurnMetadata {
turn_id: String,
product_client_id: Option<String>,
model: Option<String>,
turn_type: Option<TurnType>,
model_provider: String,
sandbox_policy: Option<&'static str>,
reasoning_effort: Option<String>,
@@ -460,7 +462,6 @@ struct CodexInputMessageMetadata {
turn_id: Option<String>,
product_client_id: Option<String>,
model_slug: Option<String>,
message_role: Option<InputMessageRole>,
user_message_type: Option<UserMessageType>,
}
@@ -595,7 +596,7 @@ pub(crate) fn track_input_message_metadata(
queue: &AnalyticsEventsQueue,
config: Arc<Config>,
tracking: Option<TrackEventsContext>,
input_message_metadata: InputMessageMetadata,
input_message_metadata: UserMessageMetadata,
) {
if config.analytics_enabled == Some(false) {
return;
@@ -844,6 +845,7 @@ fn codex_turn_metadata(
turn_id: tracking.turn_id.clone(),
product_client_id: Some(crate::default_client::originator().value),
model: Some(tracking.model_slug.clone()),
turn_type: turn_metadata.turn_type,
model_provider: turn_metadata.model_provider,
sandbox_policy: Some(sandbox_policy_mode(&turn_metadata.sandbox_policy)),
reasoning_effort: turn_metadata
@@ -865,14 +867,13 @@ fn codex_turn_metadata(
fn codex_input_message_metadata(
tracking: &TrackEventsContext,
input_message_metadata: InputMessageMetadata,
input_message_metadata: UserMessageMetadata,
) -> CodexInputMessageMetadata {
CodexInputMessageMetadata {
thread_id: Some(tracking.thread_id.clone()),
turn_id: Some(tracking.turn_id.clone()),
product_client_id: Some(crate::default_client::originator().value),
model_slug: Some(tracking.model_slug.clone()),
message_role: Some(input_message_metadata.message_role),
user_message_type: Some(input_message_metadata.user_message_type),
}
}
+5 -5
View File
@@ -6,12 +6,12 @@ use super::CodexInputMessageMetadataEventRequest;
use super::CodexPluginEventRequest;
use super::CodexPluginUsedEventRequest;
use super::CodexTurnMetadataEventRequest;
use super::InputMessageMetadata;
use super::InputMessageRole;
use super::InvocationType;
use super::TrackEventRequest;
use super::TrackEventsContext;
use super::TurnMetadata;
use super::TurnType;
use super::UserMessageMetadata;
use super::UserMessageType;
use super::codex_app_metadata;
use super::codex_input_message_metadata;
@@ -214,6 +214,7 @@ fn turn_metadata_event_serializes_expected_shape() {
&tracking,
TurnMetadata {
model_provider: "openai".to_string(),
turn_type: Some(TurnType::Prompt),
sandbox_policy: SandboxPolicy::new_read_only_policy(),
reasoning_effort: Some(ReasoningEffort::High),
reasoning_summary: Some(ReasoningSummary::Detailed),
@@ -239,6 +240,7 @@ fn turn_metadata_event_serializes_expected_shape() {
"turn_id": "turn-2",
"product_client_id": crate::default_client::originator().value,
"model": "gpt-5",
"turn_type": "prompt",
"model_provider": "openai",
"sandbox_policy": "read_only",
"reasoning_effort": "high",
@@ -266,8 +268,7 @@ fn input_message_metadata_event_serializes_expected_shape() {
event_type: "codex_input_message_metadata",
event_params: codex_input_message_metadata(
&tracking,
InputMessageMetadata {
message_role: InputMessageRole::User,
UserMessageMetadata {
user_message_type: UserMessageType::PromptSteering,
},
),
@@ -284,7 +285,6 @@ fn input_message_metadata_event_serializes_expected_shape() {
"turn_id": "turn-2",
"product_client_id": crate::default_client::originator().value,
"model_slug": "gpt-5",
"message_role": "user",
"user_message_type": "prompt_steering"
}
})
+13 -16
View File
@@ -14,11 +14,10 @@ use crate::agent::AgentStatus;
use crate::agent::agent_status_from_event;
use crate::analytics_client::AnalyticsEventsClient;
use crate::analytics_client::AppInvocation;
use crate::analytics_client::InputMessageMetadata;
use crate::analytics_client::InputMessageRole;
use crate::analytics_client::InvocationType;
use crate::analytics_client::TurnMetadata;
use crate::analytics_client::UserMessageType;
use crate::analytics_client::TurnType;
use crate::analytics_client::UserMessageMetadata;
use crate::analytics_client::build_track_events_context;
use crate::apps::render_apps_section;
use crate::auth_env_telemetry::collect_auth_env_telemetry;
@@ -949,6 +948,7 @@ impl TurnContext {
provider: self.provider.clone(),
reasoning_effort,
reasoning_summary: self.reasoning_summary,
user_message_type: None,
session_source: self.session_source.clone(),
environment: Arc::clone(&self.environment),
cwd: self.cwd.clone(),
@@ -3942,9 +3942,8 @@ impl Session {
.analytics_events_client
.track_input_message_metadata(
tracking,
InputMessageMetadata {
message_role: InputMessageRole::User,
user_message_type: UserMessageType::PromptSteering,
UserMessageMetadata {
user_message_type: SubmittedUserMessageType::PromptSteering,
},
);
}
@@ -4596,6 +4595,7 @@ mod handlers {
items,
collaboration_mode,
personality,
user_message_type,
} => {
let collaboration_mode = collaboration_mode.or_else(|| {
Some(CollaborationMode {
@@ -4621,7 +4621,7 @@ mod handlers {
final_output_json_schema: Some(final_output_json_schema),
personality,
app_server_client_name: None,
user_message_type: None,
user_message_type,
},
)
}
@@ -5412,6 +5412,7 @@ async fn spawn_review_thread(
provider: provider_for_context,
reasoning_effort,
reasoning_summary,
user_message_type: None,
session_source,
environment: Arc::clone(&parent_turn_context.environment),
tools_config,
@@ -5714,19 +5715,15 @@ pub(crate) async fn run_turn(
let user_message_type = turn_context
.user_message_type
.unwrap_or(SubmittedUserMessageType::Prompt);
sess.services
.analytics_events_client
.track_input_message_metadata(
tracking.clone(),
InputMessageMetadata {
message_role: InputMessageRole::User,
user_message_type,
},
);
sess.services.analytics_events_client.track_turn_metadata(
tracking.clone(),
TurnMetadata {
model_provider: turn_context.config.model_provider_id.clone(),
turn_type: match user_message_type {
SubmittedUserMessageType::Prompt => Some(TurnType::Prompt),
SubmittedUserMessageType::PromptQueued => Some(TurnType::PromptQueued),
SubmittedUserMessageType::PromptSteering => None,
},
sandbox_policy: turn_context.sandbox_policy.get().clone(),
reasoning_effort: turn_context.reasoning_effort,
reasoning_summary: Some(turn_context.reasoning_summary),
@@ -523,6 +523,7 @@ async fn run_review_on_session(
final_output_json_schema: Some(params.schema.clone()),
collaboration_mode: None,
personality: params.personality,
user_message_type: None,
})
.await
}),