Merge branch 'rhan/emittance' into rhan/escalations-approvals-sandbox

codex-rs/core/src/codex.rs

@@ -697,20 +697,6 @@ impl Codex {
         self.session.steer_input(input, expected_turn_id).await
     }
 
-    /// Use sparingly: wrapper for integration tests and callers that only hold a
-    /// `Codex` handle.
-    ///
-    /// This keeps `Session` internals encapsulated while still allowing queued
-    /// response-input behavior to be exercised from public APIs.
-    /// Returns the input unchanged when there is no active turn.
-    #[doc(hidden)]
-    pub async fn inject_response_items(
-        &self,
-        input: Vec<ResponseInputItem>,
-    ) -> Result<(), Vec<ResponseInputItem>> {
-        self.session.inject_response_items(input).await
-    }
-
     pub(crate) async fn set_app_server_client_name(
         &self,
         app_server_client_name: Option<String>,

codex-rs/core/src/codex_thread.rs

@@ -90,20 +90,6 @@ impl CodexThread {
         self.codex.steer_input(input, expected_turn_id).await
     }
 
-    /// Use sparingly: wrapper for integration tests and callers that only hold a
-    /// `CodexThread` handle.
-    ///
-    /// This preserves the same public escape hatch as `Codex` without exposing
-    /// `Session` internals directly.
-    /// Returns the input unchanged when there is no active turn.
-    #[doc(hidden)]
-    pub async fn inject_response_items(
-        &self,
-        input: Vec<ResponseInputItem>,
-    ) -> Result<(), Vec<ResponseInputItem>> {
-        self.codex.inject_response_items(input).await
-    }
-
     pub async fn set_app_server_client_name(
         &self,
         app_server_client_name: Option<String>,

codex-rs/core/tests/suite/items.rs

@@ -356,6 +356,7 @@ async fn user_message_type_prompt_steering_metadata_is_emitted_when_feature_enab
 }
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+<<<<<<< rhan/escalations-approvals-sandbox
 async fn user_message_type_prompt_queued_metadata_is_emitted_when_feature_enabled()
 -> anyhow::Result<()> {
     skip_if_no_network!(Ok(()));
@@ -495,6 +496,8 @@ async fn user_message_type_prompt_queued_metadata_is_emitted_when_feature_enable
 }
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+=======
+>>>>>>> rhan/emittance
 async fn assistant_message_item_is_emitted() -> anyhow::Result<()> {
     skip_if_no_network!(Ok(()));