Merge 0ec4a457c5 into sapling-pr-archive-bolinfest

codex-rs/core/src/codex_delegate.rs

@@ -481,7 +481,7 @@ async fn handle_exec_approval(
             parent_session,
             &approval_id_for_op,
             cancel_token,
-            None,
+            /*review_cancel_token=*/ None,
         )
         .await
     };
@@ -587,7 +587,7 @@ async fn handle_patch_approval(
             parent_session,
             &approval_id,
             cancel_token,
-            None,
+            /*review_cancel_token=*/ None,
         )
         .await
     };
@@ -675,7 +675,7 @@ async fn maybe_auto_review_mcp_request_user_input(
         Arc::clone(parent_session),
         Arc::clone(parent_ctx),
         build_guardian_mcp_tool_review_request(&event.call_id, &invocation, metadata.as_ref()),
-        None,
+        /*retry_reason=*/ None,
         review_cancel.clone(),
     );
     let decision = await_approval_with_cancel(

codex-rs/core/src/guardian.rs

@@ -382,7 +382,7 @@ pub(crate) async fn review_approval_request(
         Arc::clone(turn),
         request,
         retry_reason,
-        None,
+        /*external_cancel=*/ None,
     )
     .await
 }

codex-rs/core/src/mcp_tool_call.rs

@@ -108,7 +108,7 @@ pub(crate) async fn handle_mcp_tool_call(
             &call_id,
             invocation,
             "MCP tool call blocked by app configuration".to_string(),
-            false,
+            /*already_started=*/ false,
         )
         .await;
         let status = if result.is_ok() { "ok" } else { "error" };
@@ -186,7 +186,7 @@ pub(crate) async fn handle_mcp_tool_call(
                     &call_id,
                     invocation,
                     message,
-                    true,
+                    /*already_started=*/ true,
                 )
                 .await
             }
@@ -198,7 +198,7 @@ pub(crate) async fn handle_mcp_tool_call(
                     &call_id,
                     invocation,
                     message,
-                    true,
+                    /*already_started=*/ true,
                 )
                 .await
             }
@@ -209,7 +209,7 @@ pub(crate) async fn handle_mcp_tool_call(
                     &call_id,
                     invocation,
                     message,
-                    true,
+                    /*already_started=*/ true,
                 )
                 .await
             }

codex-rs/core/src/models_manager/manager.rs

@@ -98,7 +98,7 @@ impl ModelsManager {
             auth_manager,
             model_catalog,
             collaboration_modes_config,
-            ModelProviderInfo::create_openai_provider(/* base_url */ None),
+            ModelProviderInfo::create_openai_provider(/*base_url=*/ None),
         )
     }
 
@@ -433,7 +433,7 @@ impl ModelsManager {
         Self::new_with_provider(
             codex_home,
             auth_manager,
-            None,
+            /*model_catalog=*/ None,
             CollaborationModesConfig::default(),
             provider,
         )

codex-rs/core/src/thread_manager.rs

@@ -173,7 +173,7 @@ impl ThreadManager {
             .model_providers
             .get(OPENAI_PROVIDER_ID)
             .cloned()
-            .unwrap_or_else(|| ModelProviderInfo::create_openai_provider(/* base_url */ None));
+            .unwrap_or_else(|| ModelProviderInfo::create_openai_provider(/*base_url=*/ None));
         let (thread_created_tx, _) = broadcast::channel(THREAD_CREATED_CHANNEL_CAPACITY);
         let plugins_manager = Arc::new(PluginsManager::new(codex_home.clone()));
         let mcp_manager = Arc::new(McpManager::new(Arc::clone(&plugins_manager)));