Make agent task registration failure retryable

Author: adrian-openai

codex-rs/core/src/codex.rs

@@ -1549,7 +1549,7 @@ impl Session {
     async fn fail_agent_identity_registration(self: &Arc<Self>, error: anyhow::Error) {
         warn!(error = %error, "agent identity registration failed");
         let message = format!(
-            "Agent identity registration failed. Codex cannot continue while `features.use_agent_identity` is enabled: {error}"
+            "Agent identity registration failed while `features.use_agent_identity` is enabled: {error}"
         );
         self.send_event_raw(Event {
             id: self.next_internal_sub_id(),
@@ -1559,7 +1559,6 @@ impl Session {
             }),
         })
         .await;
-        handlers::shutdown(self, self.next_internal_sub_id()).await;
     }
 
     async fn cached_agent_task_for_current_binding(&self) -> Option<RegisteredAgentTask> {
@@ -6475,7 +6474,16 @@ pub(crate) async fn run_turn(
     }
     if let Err(error) = sess.ensure_agent_task_registered().await {
         warn!(error = %error, "agent task registration failed");
-        sess.fail_agent_identity_registration(error).await;
+        sess.send_event(
+            turn_context.as_ref(),
+            EventMsg::Error(ErrorEvent {
+                message: format!(
+                    "Agent task registration failed. Please try again; Codex will attempt to register the task again on the next turn: {error}"
+                ),
+                codex_error_info: Some(CodexErrorInfo::Other),
+            }),
+        )
+        .await;
         return None;
     }
 

codex-rs/core/src/codex_tests.rs

@@ -3782,7 +3782,7 @@ pub(crate) async fn make_session_and_context_with_rx() -> (
 }
 
 #[tokio::test]
-async fn fail_agent_identity_registration_emits_error_and_shutdown() {
+async fn fail_agent_identity_registration_emits_error_without_shutdown() {
     let (session, _turn_context, rx_event) = make_session_and_context_with_rx().await;
 
     session
@@ -3800,21 +3800,14 @@ async fn fail_agent_identity_registration_emits_error_and_shutdown() {
         }) => {
             assert_eq!(
                 message,
-                "Agent identity registration failed. Codex cannot continue while `features.use_agent_identity` is enabled: registration exploded".to_string()
+                "Agent identity registration failed while `features.use_agent_identity` is enabled: registration exploded".to_string()
             );
             assert_eq!(codex_error_info, Some(CodexErrorInfo::Other));
         }
         other => panic!("expected error event, got {other:?}"),
     }
 
-    let shutdown_event = timeout(Duration::from_secs(1), rx_event.recv())
-        .await
-        .expect("shutdown event should arrive")
-        .expect("shutdown event should be readable");
-    match shutdown_event.msg {
-        EventMsg::ShutdownComplete => {}
-        other => panic!("expected shutdown event, got {other:?}"),
-    }
+    assert!(rx_event.try_recv().is_err());
 }
 
 #[tokio::test]