wip

Author: nornagon-openai

codex-rs/core/src/codex.rs

@@ -1217,7 +1217,12 @@ impl Session {
 
     pub async fn interrupt_task(self: &Arc<Self>) {
         info!("interrupt received: abort current task, if any");
-        self.abort_all_tasks(TurnAbortReason::Interrupted).await;
+        let has_active_turn = { self.active_turn.lock().await.is_some() };
+        if has_active_turn {
+            self.abort_all_tasks(TurnAbortReason::Interrupted).await;
+        } else {
+            self.cancel_mcp_startup().await;
+        }
     }
 
     pub(crate) fn notifier(&self) -> &UserNotifier {

codex-rs/core/src/mcp_connection_manager.rs

@@ -801,7 +801,7 @@ fn validate_mcp_server_name(server_name: &str) -> Result<()> {
     let re = regex_lite::Regex::new(r"^[a-zA-Z0-9_-]+$")?;
     if !re.is_match(server_name) {
         return Err(anyhow!(
-            "invalid server name '{server_name}': must match pattern {pattern}",
+            "Invalid MCP server name '{server_name}': must match pattern {pattern}",
             pattern = re.as_str()
         ));
     }