Merge branch 'main' of github.com:openai/codex into codex/websocket-reverse-4

# Conflicts:
#	codex-rs/features/src/lib.rs

codex-rs/app-server/src/transport/remote_control/enroll.rs

@@ -327,7 +327,7 @@ mod tests {
             Some(state_db.as_ref()),
             &first_target,
             Some("account-a"),
-            None,
+            /*enrollment*/ None,
         )
         .await
         .expect("matching enrollment should clear");