From 84089dea294e20f9b3a2cbd0d913619176324c5e Mon Sep 17 00:00:00 2001 From: Andrei Eternal Date: Wed, 3 Jun 2026 18:40:54 -0700 Subject: [PATCH] codex: fix TaskAbort compile break on PR #26259 --- codex-rs/core/src/guardian/review.rs | 1 - codex-rs/core/src/session/handlers.rs | 1 - codex-rs/core/src/session/mod.rs | 1 - codex-rs/core/src/tasks/mod.rs | 10 +++++----- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/codex-rs/core/src/guardian/review.rs b/codex-rs/core/src/guardian/review.rs index dea07f4116..4fc5f7bd29 100644 --- a/codex-rs/core/src/guardian/review.rs +++ b/codex-rs/core/src/guardian/review.rs @@ -15,7 +15,6 @@ use codex_protocol::protocol::GuardianRiskLevel; use codex_protocol::protocol::GuardianUserAuthorization; use codex_protocol::protocol::ReviewDecision; use codex_protocol::protocol::SubAgentSource; -use codex_protocol::protocol::TurnAbortReason; use codex_protocol::protocol::WarningEvent; use std::sync::Arc; use tokio::sync::oneshot; diff --git a/codex-rs/core/src/session/handlers.rs b/codex-rs/core/src/session/handlers.rs index d89c199321..e40e3f666a 100644 --- a/codex-rs/core/src/session/handlers.rs +++ b/codex-rs/core/src/session/handlers.rs @@ -47,7 +47,6 @@ use codex_protocol::protocol::ThreadRolledBackEvent; use codex_protocol::protocol::ThreadSettingsAppliedEvent; use codex_protocol::protocol::ThreadSettingsOverrides; use codex_protocol::protocol::ThreadSettingsSnapshot; -use codex_protocol::protocol::TurnAbortReason; use codex_protocol::protocol::WarningEvent; use codex_protocol::request_permissions::RequestPermissionsResponse; use codex_protocol::request_user_input::RequestUserInputResponse; diff --git a/codex-rs/core/src/session/mod.rs b/codex-rs/core/src/session/mod.rs index 9a29cee46c..f617f59056 100644 --- a/codex-rs/core/src/session/mod.rs +++ b/codex-rs/core/src/session/mod.rs @@ -113,7 +113,6 @@ use codex_protocol::protocol::RolloutItem; use codex_protocol::protocol::SessionSource; use codex_protocol::protocol::SubAgentSource; use codex_protocol::protocol::ThreadSource; -use codex_protocol::protocol::TurnAbortReason; use codex_protocol::protocol::TurnContextItem; use codex_protocol::protocol::TurnContextNetworkItem; use codex_protocol::protocol::TurnEnvironmentSelection; diff --git a/codex-rs/core/src/tasks/mod.rs b/codex-rs/core/src/tasks/mod.rs index a0150c61f1..02a9f31d7f 100644 --- a/codex-rs/core/src/tasks/mod.rs +++ b/codex-rs/core/src/tasks/mod.rs @@ -65,7 +65,7 @@ pub(crate) use user_shell::execute_user_shell_command; const GRACEFULL_INTERRUPTION_TIMEOUT_MS: u64 = 100; const TASK_COMPACT_METRIC: &str = "codex.task.compact"; -#[derive(Debug, Clone, Copy, PartialEq, Eq)] +#[derive(Debug, Clone, PartialEq)] enum TaskAbort { Standard(TurnAbortReason), Interrupted(InterruptReason), @@ -79,16 +79,16 @@ impl TaskAbort { } } - fn turn_abort_reason(self) -> TurnAbortReason { + fn turn_abort_reason(&self) -> TurnAbortReason { match self { - Self::Standard(reason) => reason, + Self::Standard(reason) => reason.clone(), Self::Interrupted(_) => TurnAbortReason::Interrupted, } } - fn interrupt_reason(self) -> Option { + fn interrupt_reason(&self) -> Option { match self { - Self::Interrupted(reason) => Some(reason), + Self::Interrupted(reason) => Some(*reason), Self::Standard(_) => None, } }