diff --git a/codex-rs/core/src/client.rs b/codex-rs/core/src/client.rs
index 0eb6c03138..1ec7ca83bb 100644
--- a/codex-rs/core/src/client.rs
+++ b/codex-rs/core/src/client.rs
@@ -370,7 +370,7 @@ impl ModelClient {
     /// This constructor does not perform network I/O itself; the session opens a websocket lazily
     /// when the first stream request is issued.
     pub fn new_session(&self) -> ModelClientSession {
-        self.new_session_with_agent_task(None)
+        self.new_session_with_agent_task(/*agent_task*/ None)
     }
 
     pub(crate) fn new_session_with_agent_task(
@@ -471,7 +471,7 @@ impl ModelClient {
         if prompt.input.is_empty() {
             return Ok(Vec::new());
         }
-        let client_setup = self.current_client_setup(None).await?;
+        let client_setup = self.current_client_setup(/*agent_task*/ None).await?;
         let transport = ReqwestTransport::new(build_reqwest_client());
         let request_telemetry = Self::build_request_telemetry(
             session_telemetry,
@@ -568,7 +568,7 @@ impl ModelClient {
             return Ok(Vec::new());
         }
 
-        let client_setup = self.current_client_setup(None).await?;
+        let client_setup = self.current_client_setup(/*agent_task*/ None).await?;
         let transport = ReqwestTransport::new(build_reqwest_client());
         let request_telemetry = Self::build_request_telemetry(
             session_telemetry,
@@ -740,7 +740,7 @@ impl ModelClient {
                     );
                     CoreAuthProvider::from_authorization_header_value(
                         Some(authorization_header_value),
-                        None,
+                        /*account_id*/ None,
                     )
                 } else {
                     auth_provider_from_auth(auth.clone(), &self.state.provider)?