[codex] Remove async_trait from first-party code

codex-rs/Cargo.toml

@@ -265,7 +265,6 @@ assert_matches = "1.5.0"
 async-channel = "2.3.1"
 async-io = "2.6.0"
 async-stream = "0.3.6"
-async-trait = "0.1.89"
 aws-config = "1"
 aws-credential-types = "1"
 aws-sigv4 = "1"

codex-rs/agent-graph-store/Cargo.toml

@@ -13,7 +13,6 @@ doctest = false
 workspace = true
 
 [dependencies]
-async-trait = { workspace = true }
 codex-protocol = { workspace = true }
 codex-state = { workspace = true }
 serde = { workspace = true, features = ["derive"] }

codex-rs/agent-graph-store/src/local.rs

@@ -1,4 +1,3 @@
-use async_trait::async_trait;
 use codex_protocol::ThreadId;
 use codex_state::StateRuntime;
 use std::sync::Arc;
@@ -29,7 +28,6 @@ impl LocalAgentGraphStore {
     }
 }
 
-#[async_trait]
 impl AgentGraphStore for LocalAgentGraphStore {
     async fn upsert_thread_spawn_edge(
         &self,

codex-rs/agent-graph-store/src/store.rs

@@ -1,4 +1,3 @@
-use async_trait::async_trait;
 use codex_protocol::ThreadId;
 
 use crate::AgentGraphStoreResult;
@@ -8,48 +7,47 @@ use crate::ThreadSpawnEdgeStatus;
 ///
 /// Implementations are expected to return stable ordering for list methods so callers can merge
 /// persisted graph state with live in-memory state without introducing nondeterministic output.
-#[async_trait]
 pub trait AgentGraphStore: Send + Sync {
     /// Insert or replace the directional parent/child edge for a spawned thread.
     ///
     /// `child_thread_id` has at most one persisted parent. Re-inserting the same child should
     /// update both the parent and status to match the supplied values.
-    async fn upsert_thread_spawn_edge(
+    fn upsert_thread_spawn_edge(
         &self,
         parent_thread_id: ThreadId,
         child_thread_id: ThreadId,
         status: ThreadSpawnEdgeStatus,
-    ) -> AgentGraphStoreResult<()>;
+    ) -> impl std::future::Future<Output = AgentGraphStoreResult<()>> + Send;
 
     /// Update the persisted lifecycle status of a spawned thread's incoming edge.
     ///
     /// Implementations should treat missing children as a successful no-op.
-    async fn set_thread_spawn_edge_status(
+    fn set_thread_spawn_edge_status(
         &self,
         child_thread_id: ThreadId,
         status: ThreadSpawnEdgeStatus,
-    ) -> AgentGraphStoreResult<()>;
+    ) -> impl std::future::Future<Output = AgentGraphStoreResult<()>> + Send;
 
     /// List direct spawned children of a parent thread.
     ///
     /// When `status_filter` is `Some`, only child edges with that exact status are returned. When
     /// it is `None`, all direct child edges are returned regardless of status, including statuses
     /// that may be added by a future store implementation.
-    async fn list_thread_spawn_children(
+    fn list_thread_spawn_children(
         &self,
         parent_thread_id: ThreadId,
         status_filter: Option<ThreadSpawnEdgeStatus>,
-    ) -> AgentGraphStoreResult<Vec<ThreadId>>;
+    ) -> impl std::future::Future<Output = AgentGraphStoreResult<Vec<ThreadId>>> + Send;
 
     /// List spawned descendants breadth-first by depth, then by thread id.
     ///
     /// `status_filter` is applied to every traversed edge, not just to the returned descendants.
     /// For example, `Some(Open)` walks only open edges, so descendants under a closed edge are not
     /// included even if their own incoming edge is open. `None` walks and returns every persisted
     /// edge regardless of status.
-    async fn list_thread_spawn_descendants(
+    fn list_thread_spawn_descendants(
         &self,
         root_thread_id: ThreadId,
         status_filter: Option<ThreadSpawnEdgeStatus>,
-    ) -> AgentGraphStoreResult<Vec<ThreadId>>;
+    ) -> impl std::future::Future<Output = AgentGraphStoreResult<Vec<ThreadId>>> + Send;
 }

codex-rs/app-server/Cargo.toml

@@ -22,7 +22,6 @@ workspace = true
 
 [dependencies]
 anyhow = { workspace = true }
-async-trait = { workspace = true }
 base64 = { workspace = true }
 axum = { workspace = true, default-features = false, features = [
     "http1",

codex-rs/app-server/src/mcp_refresh.rs

@@ -99,7 +99,6 @@ mod tests {
     use crate::extensions::ThreadExtensionDependencies;
     use crate::extensions::guardian_agent_spawner;
     use crate::extensions::thread_extensions;
-    use async_trait::async_trait;
     use codex_arg0::Arg0DispatchPaths;
     use codex_config::CloudConfigBundleLoader;
     use codex_config::LoaderOverrides;
@@ -245,8 +244,7 @@ mod tests {
         bad_loads: AtomicUsize,
     }
 
-    #[async_trait]
-    impl ThreadConfigLoader for CountingThreadConfigLoader {
+    impl CountingThreadConfigLoader {
         async fn load(
             &self,
             context: ThreadConfigContext,
@@ -265,4 +263,13 @@ mod tests {
             Ok(Vec::new())
         }
     }
+
+    impl ThreadConfigLoader for CountingThreadConfigLoader {
+        fn load(
+            &self,
+            context: ThreadConfigContext,
+        ) -> codex_config::ThreadConfigLoaderFuture<'_, Vec<ThreadConfigSource>> {
+            Box::pin(CountingThreadConfigLoader::load(self, context))
+        }
+    }
 }