From 8b590105de6737edf2f709461b4b4e52e467fd3c Mon Sep 17 00:00:00 2001
From: Gabriel Peal <gpeal@users.noreply.github.com>
Date: Sun, 20 Jul 2025 10:31:19 -0700
Subject: [PATCH] Don't drop sessions on elicitation responses (#1629)

---
 codex-rs/mcp-server/src/codex_tool_runner.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/codex-rs/mcp-server/src/codex_tool_runner.rs b/codex-rs/mcp-server/src/codex_tool_runner.rs
index 3036df51..ae54599f 100644
--- a/codex-rs/mcp-server/src/codex_tool_runner.rs
+++ b/codex-rs/mcp-server/src/codex_tool_runner.rs
@@ -131,7 +131,8 @@ pub async fn run_codex_tool_session(
                             });
                         }
 
-                        break;
+                        // Continue, don't break so the session continues.
+                        continue;
                     }
                     EventMsg::ApplyPatchApprovalRequest(_) => {
                         let result = CallToolResult {
@@ -144,7 +145,8 @@ pub async fn run_codex_tool_session(
                             structured_content: None,
                         };
                         outgoing.send_response(id.clone(), result.into()).await;
-                        break;
+                        // Continue, don't break so the session continues.
+                        continue;
                     }
                     EventMsg::TaskComplete(TaskCompleteEvent { last_agent_message }) => {
                         let text = match last_agent_message {