mirror of
https://github.com/openai/codex.git
synced 2026-11-15 21:50:46 +00:00
thread initialize refactoring
This commit is contained in:
@@ -39,6 +39,7 @@ pub struct ThreadInitializeInput {
|
||||
pub model: String,
|
||||
pub ephemeral: bool,
|
||||
pub session_source: SessionSource,
|
||||
pub initialization_mode: InitializationMode,
|
||||
}
|
||||
|
||||
#[derive(Clone, Copy, Debug, Serialize)]
|
||||
@@ -84,9 +85,7 @@ pub struct AppInvocation {
|
||||
|
||||
pub enum AnalyticsInput {
|
||||
Initialize(InitializeInput),
|
||||
ThreadStart(ThreadInitializeInput),
|
||||
ThreadFork(ThreadInitializeInput),
|
||||
ThreadResume(ThreadInitializeInput),
|
||||
ThreadInitialized(ThreadInitializeInput),
|
||||
SkillInvoked(SkillInvokedInput),
|
||||
AppMentioned(AppMentionedInput),
|
||||
AppUsed(AppUsedInput),
|
||||
@@ -234,16 +233,8 @@ impl AnalyticsEventsClient {
|
||||
self.record(AnalyticsInput::Initialize(input));
|
||||
}
|
||||
|
||||
pub fn track_thread_start(&self, input: ThreadInitializeInput) {
|
||||
self.record(AnalyticsInput::ThreadStart(input));
|
||||
}
|
||||
|
||||
pub fn track_thread_fork(&self, input: ThreadInitializeInput) {
|
||||
self.record(AnalyticsInput::ThreadFork(input));
|
||||
}
|
||||
|
||||
pub fn track_thread_resume(&self, input: ThreadInitializeInput) {
|
||||
self.record(AnalyticsInput::ThreadResume(input));
|
||||
pub fn track_thread_initialized(&self, input: ThreadInitializeInput) {
|
||||
self.record(AnalyticsInput::ThreadInitialized(input));
|
||||
}
|
||||
|
||||
pub fn track_app_mentioned(&self, tracking: TrackEventsContext, mentions: Vec<AppInvocation>) {
|
||||
@@ -438,14 +429,8 @@ impl AnalyticsReducer {
|
||||
AnalyticsInput::Initialize(input) => {
|
||||
self.ingest_initialize(input);
|
||||
}
|
||||
AnalyticsInput::ThreadStart(input) => {
|
||||
self.ingest_thread_initialized(input, InitializationMode::New, out);
|
||||
}
|
||||
AnalyticsInput::ThreadFork(input) => {
|
||||
self.ingest_thread_initialized(input, InitializationMode::Forked, out);
|
||||
}
|
||||
AnalyticsInput::ThreadResume(input) => {
|
||||
self.ingest_thread_initialized(input, InitializationMode::Resumed, out);
|
||||
AnalyticsInput::ThreadInitialized(input) => {
|
||||
self.ingest_thread_initialized(input, out);
|
||||
}
|
||||
AnalyticsInput::SkillInvoked(input) => {
|
||||
self.ingest_skill_invoked(input, out).await;
|
||||
@@ -477,18 +462,13 @@ impl AnalyticsReducer {
|
||||
fn ingest_thread_initialized(
|
||||
&mut self,
|
||||
input: ThreadInitializeInput,
|
||||
initialization_mode: InitializationMode,
|
||||
out: &mut Vec<TrackEventRequest>,
|
||||
) {
|
||||
let Some(client_state) = self.clients.get(&input.connection_id) else {
|
||||
return;
|
||||
};
|
||||
out.push(TrackEventRequest::CodexThreadInitialized(
|
||||
codex_thread_initialized_event_request(
|
||||
client_state.product_client_id.clone(),
|
||||
input,
|
||||
initialization_mode,
|
||||
),
|
||||
codex_thread_initialized_event_request(client_state.product_client_id.clone(), input),
|
||||
));
|
||||
}
|
||||
|
||||
@@ -611,22 +591,16 @@ fn codex_app_metadata(tracking: &TrackEventsContext, app: AppInvocation) -> Code
|
||||
fn codex_thread_initialized_event_request(
|
||||
product_client_id: String,
|
||||
input: ThreadInitializeInput,
|
||||
initialization_mode: InitializationMode,
|
||||
) -> CodexThreadInitializedEvent {
|
||||
CodexThreadInitializedEvent {
|
||||
event_type: "codex_thread_initialized",
|
||||
event_params: codex_thread_initialized_event_params(
|
||||
product_client_id,
|
||||
input,
|
||||
initialization_mode,
|
||||
),
|
||||
event_params: codex_thread_initialized_event_params(product_client_id, input),
|
||||
}
|
||||
}
|
||||
|
||||
fn codex_thread_initialized_event_params(
|
||||
product_client_id: String,
|
||||
input: ThreadInitializeInput,
|
||||
initialization_mode: InitializationMode,
|
||||
) -> CodexThreadInitializedEventParams {
|
||||
CodexThreadInitializedEventParams {
|
||||
thread_id: input.thread_id,
|
||||
@@ -634,7 +608,7 @@ fn codex_thread_initialized_event_params(
|
||||
model: input.model,
|
||||
ephemeral: input.ephemeral,
|
||||
session_source: session_source_name(&input.session_source),
|
||||
initialization_mode,
|
||||
initialization_mode: input.initialization_mode,
|
||||
subagent_source: session_source_subagent_source(&input.session_source)
|
||||
.map(subagent_source_name),
|
||||
parent_thread_id: session_source_parent_thread_id(&input.session_source),
|
||||
|
||||
@@ -204,8 +204,8 @@ fn thread_initialized_event_serializes_expected_shape() {
|
||||
model: "gpt-5".to_string(),
|
||||
ephemeral: true,
|
||||
session_source: SessionSource::Exec,
|
||||
initialization_mode: InitializationMode::New,
|
||||
},
|
||||
InitializationMode::New,
|
||||
));
|
||||
|
||||
let payload = serde_json::to_value(&event).expect("serialize thread initialized event");
|
||||
@@ -240,8 +240,8 @@ fn thread_initialized_event_serializes_subagent_source() {
|
||||
model: "gpt-5".to_string(),
|
||||
ephemeral: false,
|
||||
session_source: SessionSource::SubAgent(SubAgentSource::Review),
|
||||
initialization_mode: InitializationMode::New,
|
||||
},
|
||||
InitializationMode::New,
|
||||
));
|
||||
|
||||
let payload =
|
||||
@@ -250,27 +250,6 @@ fn thread_initialized_event_serializes_subagent_source() {
|
||||
assert_eq!(payload["event_params"]["subagent_source"], "review");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn thread_initialized_event_omits_non_user_non_subagent_session_source() {
|
||||
let event = TrackEventRequest::CodexThreadInitialized(codex_thread_initialized_event_request(
|
||||
originator().value,
|
||||
ThreadInitializeInput {
|
||||
connection_id: 1,
|
||||
thread_id: "thread-2".to_string(),
|
||||
model: "gpt-5".to_string(),
|
||||
ephemeral: false,
|
||||
session_source: SessionSource::Mcp,
|
||||
},
|
||||
InitializationMode::New,
|
||||
));
|
||||
|
||||
let payload = serde_json::to_value(&event).expect("serialize mcp thread initialized event");
|
||||
assert_eq!(
|
||||
payload["event_params"]["session_source"],
|
||||
serde_json::Value::Null
|
||||
);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn initialize_caches_client_and_thread_lifecycle_publishes_once_initialized() {
|
||||
let mut reducer = AnalyticsReducer::default();
|
||||
@@ -278,12 +257,13 @@ async fn initialize_caches_client_and_thread_lifecycle_publishes_once_initialize
|
||||
|
||||
reducer
|
||||
.ingest(
|
||||
AnalyticsInput::ThreadStart(ThreadInitializeInput {
|
||||
AnalyticsInput::ThreadInitialized(ThreadInitializeInput {
|
||||
connection_id: 7,
|
||||
thread_id: "thread-no-client".to_string(),
|
||||
model: "gpt-5".to_string(),
|
||||
ephemeral: false,
|
||||
session_source: SessionSource::Exec,
|
||||
initialization_mode: InitializationMode::New,
|
||||
}),
|
||||
&mut events,
|
||||
)
|
||||
@@ -303,7 +283,7 @@ async fn initialize_caches_client_and_thread_lifecycle_publishes_once_initialize
|
||||
|
||||
reducer
|
||||
.ingest(
|
||||
AnalyticsInput::ThreadResume(ThreadInitializeInput {
|
||||
AnalyticsInput::ThreadInitialized(ThreadInitializeInput {
|
||||
connection_id: 7,
|
||||
thread_id: "thread-1".to_string(),
|
||||
model: "gpt-5".to_string(),
|
||||
@@ -318,6 +298,7 @@ async fn initialize_caches_client_and_thread_lifecycle_publishes_once_initialize
|
||||
agent_nickname: None,
|
||||
agent_role: None,
|
||||
}),
|
||||
initialization_mode: InitializationMode::Resumed,
|
||||
}),
|
||||
&mut events,
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user