Fix post-rebase merge fallout

Co-authored-by: Codex <noreply@openai.com>

Author: charley-oai

codex-rs/core/src/codex.rs

@@ -3512,7 +3512,6 @@ impl Session {
         {
             developer_envelope.push(subagent_roster);
         }
-        if let Some(developer_message) = developer_envelope.build() {
         let mut items = Vec::with_capacity(3);
         if let Some(developer_message) = developer_envelope.build() {
             items.push(developer_message);
@@ -5640,6 +5639,7 @@ pub(crate) async fn run_turn(
         .await;
     let mut last_agent_message: Option<String> = None;
     let mut stop_hook_active = false;
+    let mut pending_stop_hook_message: Option<String> = None;
     // Although from the perspective of codex.rs, TurnDiffTracker has the lifecycle of a Task which contains
     // many turns, from the perspective of the user, it is a single turn.
     let turn_diff_tracker = Arc::new(tokio::sync::Mutex::new(TurnDiffTracker::new()));
@@ -5838,13 +5838,7 @@ pub(crate) async fn run_turn(
                     if stop_outcome.should_block {
                         if let Some(continuation_prompt) = stop_outcome.continuation_prompt.clone()
                         {
-                            let developer_message: ResponseItem =
-                                DeveloperInstructions::new(continuation_prompt).into();
-                            sess.record_conversation_items(
-                                &turn_context,
-                                std::slice::from_ref(&developer_message),
-                            )
-                            .await;
+                            pending_stop_hook_message = Some(continuation_prompt);
                             stop_hook_active = true;
                             continue;
                         } else {