Skip to content

armgit / codex

Public Imported from GitHub
0

Lightweight coding agent that runs in your terminal

Rust

Honor prior cancellation before starting Codex delegates (#51063)

jifcacdc4661934
diff --git a/codex-rs/core/src/codex_delegate.rs b/codex-rs/core/src/codex_delegate.rs
index 8b109f9da4..6caab5ea78 100644
--- a/codex-rs/core/src/codex_delegate.rs
+++ b/codex-rs/core/src/codex_delegate.rs
@@ -67,6 +67,10 @@ pub(crate) async fn run_codex_thread_interactive(
"Codex delegates require approval policy `never`".to_string(),
));
}
+ // Do not let admission or a ready startup error win over prior cancellation.
+ if cancel_token.is_cancelled() {
+ return Err(CodexErr::TurnAborted);
+ }
config.permissions.approval_policy = Constrained::allow_only(AskForApproval::Never);
config.model_provider.supports_websockets &= parent_session
.services
diff --git a/codex-rs/core/src/codex_delegate_tests.rs b/codex-rs/core/src/codex_delegate_tests.rs
index d382a26362..0ca83da485 100644
--- a/codex-rs/core/src/codex_delegate_tests.rs
+++ b/codex-rs/core/src/codex_delegate_tests.rs
@@ -187,38 +187,47 @@ async fn forward_ops_preserves_submission_trace_context() {
#[tokio::test]
async fn run_codex_thread_interactive_respects_pre_cancelled_spawn() {
- let (parent_session, parent_ctx, _rx_events) =
- crate::session::tests::make_session_and_context_with_rx().await;
- let mut config = parent_ctx.config.as_ref().clone();
- config.permissions.approval_policy = Constrained::allow_only(AskForApproval::Never);
- let cancel_token = CancellationToken::new();
- cancel_token.cancel();
- let parent_environments = parent_ctx.initial_environments.clone();
+ for shutdown_requested in [false, true] {
+ let (parent_session, parent_ctx, _rx_events) =
+ crate::session::tests::make_session_and_context_with_rx().await;
+ if shutdown_requested {
+ parent_session
+ .services
+ .local_agent_runtime
+ .request_shutdown();
+ }
+ let mut config = parent_ctx.config.as_ref().clone();
+ config.permissions.approval_policy = Constrained::allow_only(AskForApproval::Never);
+ let cancel_token = CancellationToken::new();
+ cancel_token.cancel();
+ let parent_environments = parent_ctx.initial_environments.clone();
- let result = timeout(
- Duration::from_secs(/*secs*/ 1),
- run_codex_thread_interactive(
- config,
- Arc::clone(&parent_session.services.auth_manager),
- Arc::clone(&parent_session.services.models_manager),
- parent_session,
- parent_ctx,
- parent_environments,
- cancel_token,
- SubAgentSource::Review,
- codex_extension_api::SessionIsolation::Inherit,
- /*initial_history*/ None,
- crate::session::GitEnrichmentPolicy::Fresh,
- codex_sandboxing::WindowsSandboxProxySettingsMode::Reconcile,
- ),
- )
- .await
- .expect("cancelled delegate spawn should not hang");
+ let result = timeout(
+ Duration::from_secs(/*secs*/ 1),
+ run_codex_thread_interactive(
+ config,
+ Arc::clone(&parent_session.services.auth_manager),
+ Arc::clone(&parent_session.services.models_manager),
+ parent_session,
+ parent_ctx,
+ parent_environments,
+ cancel_token,
+ SubAgentSource::Review,
+ codex_extension_api::SessionIsolation::Inherit,
+ /*initial_history*/ None,
+ crate::session::GitEnrichmentPolicy::Fresh,
+ codex_sandboxing::WindowsSandboxProxySettingsMode::Reconcile,
+ ),
+ )
+ .await
+ .expect("cancelled delegate spawn should not hang");
- assert!(matches!(
- result,
- Err(err) if matches!(err.details(), CodexErrorDetails::TurnAborted)
- ));
+ let error = result.err().expect("cancelled delegate spawn should fail");
+ assert!(
+ matches!(error.details(), CodexErrorDetails::TurnAborted),
+ "unexpected cancelled delegate spawn error (shutdown_requested={shutdown_requested}): {error}"
+ );
+ }
}
#[tokio::test]