From 57bed0446f61a73df6a17a0b64c51b5bfdd202a2 Mon Sep 17 00:00:00 2001
From: Roy Han <rhan@openai.com>
Date: Tue, 31 Mar 2026 18:30:58 -0700
Subject: [PATCH] rebase

---
 codex-rs/analytics/src/client.rs  | 4 ++--
 codex-rs/analytics/src/reducer.rs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/codex-rs/analytics/src/client.rs b/codex-rs/analytics/src/client.rs
index 77de76d903..6fb61d3946 100644
--- a/codex-rs/analytics/src/client.rs
+++ b/codex-rs/analytics/src/client.rs
@@ -6,15 +6,15 @@ use crate::facts::AnalyticsFact;
 use crate::facts::AppInvocation;
 use crate::facts::AppMentionedInput;
 use crate::facts::AppUsedInput;
+use crate::facts::CodexTurnSteerEvent;
 use crate::facts::CustomAnalyticsFact;
 use crate::facts::PluginState;
 use crate::facts::PluginStateChangedInput;
 use crate::facts::SkillInvocation;
 use crate::facts::SkillInvokedInput;
-use crate::facts::TurnSteerInput;
 use crate::facts::TrackEventsContext;
-use crate::facts::CodexTurnSteerEvent;
 use crate::facts::TurnResolvedConfigFact;
+use crate::facts::TurnSteerInput;
 use crate::reducer::AnalyticsReducer;
 use codex_app_server_protocol::ClientRequest;
 use codex_app_server_protocol::ClientResponse;
diff --git a/codex-rs/analytics/src/reducer.rs b/codex-rs/analytics/src/reducer.rs
index 99cc8584e7..b0f2eda34c 100644
--- a/codex-rs/analytics/src/reducer.rs
+++ b/codex-rs/analytics/src/reducer.rs
@@ -29,9 +29,9 @@ use crate::facts::PluginStateChangedInput;
 use crate::facts::PluginUsedInput;
 use crate::facts::SkillInvokedInput;
 use crate::facts::TurnResolvedConfigFact;
+use crate::facts::TurnStatus;
 use crate::facts::TurnSteerInput;
 use crate::facts::TurnSteerResult;
-use crate::facts::TurnStatus;
 use codex_app_server_protocol::ClientRequest;
 use codex_app_server_protocol::ClientResponse;
 use codex_app_server_protocol::CodexErrorInfo as AppServerCodexErrorInfo;