mirror of
https://github.com/openai/codex.git
synced 2026-09-20 12:47:38 +00:00
## Why This continues the compile-time cleanup from #16630. `SessionTask` implementations are monomorphized, but `Session` stores the task behind a `dyn` boundary so it can drive and abort heterogenous turn tasks uniformly. That means we can move the `#[async_trait]` expansion off the implementation trait, keep a small boxed adapter only at the storage boundary, and preserve the existing task lifecycle semantics while reducing the amount of generated async-trait glue in `codex-core`. One measurement caveat showed up while exploring this: a warm incremental benchmark based on `touch core/src/tasks/mod.rs && cargo check -p codex-core --lib` was basically flat, but that was the wrong benchmark for this change. Using package-clean `codex-core` rebuilds, like #16630, shows the real win. Relevant pre-change code: - [`SessionTask` with `#[async_trait]`](3c7f013f97/codex-rs/core/src/tasks/mod.rs (L129-L182)) - [`RunningTask` storing `Arc<dyn SessionTask>`](3c7f013f97/codex-rs/core/src/state/turn.rs (L69-L77)) ## What changed - Switched `SessionTask::{run, abort}` to native RPITIT futures with explicit `Send` bounds. - Added a private `AnySessionTask` adapter that boxes those futures only at the `Arc<dyn ...>` storage boundary. - Updated `RunningTask` to store `Arc<dyn AnySessionTask>` and removed `#[async_trait]` from the concrete task impls plus test-only `SessionTask` impls. ## Timing Benchmarked package-clean `codex-core` rebuilds with dependencies left warm: ```shell cargo check -p codex-core --lib >/dev/null cargo clean -p codex-core >/dev/null /usr/bin/time -p cargo +nightly rustc -p codex-core --lib -- \ -Z time-passes \ -Z time-passes-format=json >/dev/null ``` | revision | rustc `total` | process `real` | `generate_crate_metadata` | `MIR_borrow_checking` | `monomorphization_collector_graph_walk` | | --- | ---: | ---: | ---: | ---: | ---: | | parent `3c7f013f9735` | 67.21s | 67.71s | 24.61s | 23.43s | 22.43s | | this PR `2cafd783ac22` | 35.08s | 35.60s | 8.01s | 7.25s | 7.15s | | delta | -47.8% | -47.4% | -67.5% | -69.1% | -68.1% | For completeness, the warm touched-file benchmark stayed flat (`1.96s` parent vs `1.97s` this PR), which is why that benchmark should not be used to evaluate this refactor. ## Verification - Ran `cargo test -p codex-core`; this change compiled and task-related tests passed before hitting the same unrelated 5 `config::tests::*guardian*` failures already present on the parent stack.
256 lines
8.3 KiB
Rust
256 lines
8.3 KiB
Rust
//! Turn-scoped state and active turn metadata scaffolding.
|
|
|
|
use codex_sandboxing::policy_transforms::merge_permission_profiles;
|
|
use indexmap::IndexMap;
|
|
use std::collections::HashMap;
|
|
use std::sync::Arc;
|
|
use tokio::sync::Mutex;
|
|
use tokio::sync::Notify;
|
|
use tokio_util::sync::CancellationToken;
|
|
use tokio_util::task::AbortOnDropHandle;
|
|
|
|
use codex_protocol::dynamic_tools::DynamicToolResponse;
|
|
use codex_protocol::models::ResponseInputItem;
|
|
use codex_protocol::request_permissions::RequestPermissionsResponse;
|
|
use codex_protocol::request_user_input::RequestUserInputResponse;
|
|
use codex_rmcp_client::ElicitationResponse;
|
|
use rmcp::model::RequestId;
|
|
use tokio::sync::oneshot;
|
|
|
|
use crate::codex::TurnContext;
|
|
use crate::tasks::AnySessionTask;
|
|
use codex_protocol::models::PermissionProfile;
|
|
use codex_protocol::protocol::ReviewDecision;
|
|
use codex_protocol::protocol::TokenUsage;
|
|
|
|
/// Metadata about the currently running turn.
|
|
pub(crate) struct ActiveTurn {
|
|
pub(crate) tasks: IndexMap<String, RunningTask>,
|
|
pub(crate) turn_state: Arc<Mutex<TurnState>>,
|
|
}
|
|
|
|
/// Whether mailbox deliveries should still be folded into the current turn.
|
|
///
|
|
/// State machine:
|
|
/// - A turn starts in `CurrentTurn`, so queued child mail can join the next
|
|
/// model request for that turn.
|
|
/// - After user-visible terminal output is recorded, we switch to `NextTurn`
|
|
/// to leave late child mail queued instead of extending an already shown
|
|
/// answer.
|
|
/// - If the same task later gets explicit same-turn work again (a steered user
|
|
/// prompt or a tool call after an untagged preamble), we reopen `CurrentTurn`
|
|
/// so that pending child mail is drained into that follow-up request.
|
|
#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
|
|
pub(crate) enum MailboxDeliveryPhase {
|
|
/// Incoming mailbox messages can still be consumed by the current turn.
|
|
#[default]
|
|
CurrentTurn,
|
|
/// The current turn already emitted visible final answer text; mailbox
|
|
/// messages should remain queued for a later turn.
|
|
NextTurn,
|
|
}
|
|
|
|
impl Default for ActiveTurn {
|
|
fn default() -> Self {
|
|
Self {
|
|
tasks: IndexMap::new(),
|
|
turn_state: Arc::new(Mutex::new(TurnState::default())),
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
|
|
pub(crate) enum TaskKind {
|
|
Regular,
|
|
Review,
|
|
Compact,
|
|
}
|
|
|
|
pub(crate) struct RunningTask {
|
|
pub(crate) done: Arc<Notify>,
|
|
pub(crate) kind: TaskKind,
|
|
pub(crate) task: Arc<dyn AnySessionTask>,
|
|
pub(crate) cancellation_token: CancellationToken,
|
|
pub(crate) handle: Arc<AbortOnDropHandle<()>>,
|
|
pub(crate) turn_context: Arc<TurnContext>,
|
|
// Timer recorded when the task drops to capture the full turn duration.
|
|
pub(crate) _timer: Option<codex_otel::Timer>,
|
|
}
|
|
|
|
impl ActiveTurn {
|
|
pub(crate) fn add_task(&mut self, task: RunningTask) {
|
|
let sub_id = task.turn_context.sub_id.clone();
|
|
self.tasks.insert(sub_id, task);
|
|
}
|
|
|
|
pub(crate) fn remove_task(&mut self, sub_id: &str) -> bool {
|
|
self.tasks.swap_remove(sub_id);
|
|
self.tasks.is_empty()
|
|
}
|
|
|
|
pub(crate) fn drain_tasks(&mut self) -> Vec<RunningTask> {
|
|
self.tasks.drain(..).map(|(_, task)| task).collect()
|
|
}
|
|
}
|
|
|
|
/// Mutable state for a single turn.
|
|
#[derive(Default)]
|
|
pub(crate) struct TurnState {
|
|
pending_approvals: HashMap<String, oneshot::Sender<ReviewDecision>>,
|
|
pending_request_permissions: HashMap<String, oneshot::Sender<RequestPermissionsResponse>>,
|
|
pending_user_input: HashMap<String, oneshot::Sender<RequestUserInputResponse>>,
|
|
pending_elicitations: HashMap<(String, RequestId), oneshot::Sender<ElicitationResponse>>,
|
|
pending_dynamic_tools: HashMap<String, oneshot::Sender<DynamicToolResponse>>,
|
|
pending_input: Vec<ResponseInputItem>,
|
|
mailbox_delivery_phase: MailboxDeliveryPhase,
|
|
granted_permissions: Option<PermissionProfile>,
|
|
pub(crate) tool_calls: u64,
|
|
pub(crate) token_usage_at_turn_start: TokenUsage,
|
|
}
|
|
|
|
impl TurnState {
|
|
pub(crate) fn insert_pending_approval(
|
|
&mut self,
|
|
key: String,
|
|
tx: oneshot::Sender<ReviewDecision>,
|
|
) -> Option<oneshot::Sender<ReviewDecision>> {
|
|
self.pending_approvals.insert(key, tx)
|
|
}
|
|
|
|
pub(crate) fn remove_pending_approval(
|
|
&mut self,
|
|
key: &str,
|
|
) -> Option<oneshot::Sender<ReviewDecision>> {
|
|
self.pending_approvals.remove(key)
|
|
}
|
|
|
|
pub(crate) fn clear_pending(&mut self) {
|
|
self.pending_approvals.clear();
|
|
self.pending_request_permissions.clear();
|
|
self.pending_user_input.clear();
|
|
self.pending_elicitations.clear();
|
|
self.pending_dynamic_tools.clear();
|
|
self.pending_input.clear();
|
|
}
|
|
|
|
pub(crate) fn insert_pending_request_permissions(
|
|
&mut self,
|
|
key: String,
|
|
tx: oneshot::Sender<RequestPermissionsResponse>,
|
|
) -> Option<oneshot::Sender<RequestPermissionsResponse>> {
|
|
self.pending_request_permissions.insert(key, tx)
|
|
}
|
|
|
|
pub(crate) fn remove_pending_request_permissions(
|
|
&mut self,
|
|
key: &str,
|
|
) -> Option<oneshot::Sender<RequestPermissionsResponse>> {
|
|
self.pending_request_permissions.remove(key)
|
|
}
|
|
|
|
pub(crate) fn insert_pending_user_input(
|
|
&mut self,
|
|
key: String,
|
|
tx: oneshot::Sender<RequestUserInputResponse>,
|
|
) -> Option<oneshot::Sender<RequestUserInputResponse>> {
|
|
self.pending_user_input.insert(key, tx)
|
|
}
|
|
|
|
pub(crate) fn remove_pending_user_input(
|
|
&mut self,
|
|
key: &str,
|
|
) -> Option<oneshot::Sender<RequestUserInputResponse>> {
|
|
self.pending_user_input.remove(key)
|
|
}
|
|
|
|
pub(crate) fn insert_pending_elicitation(
|
|
&mut self,
|
|
server_name: String,
|
|
request_id: RequestId,
|
|
tx: oneshot::Sender<ElicitationResponse>,
|
|
) -> Option<oneshot::Sender<ElicitationResponse>> {
|
|
self.pending_elicitations
|
|
.insert((server_name, request_id), tx)
|
|
}
|
|
|
|
pub(crate) fn remove_pending_elicitation(
|
|
&mut self,
|
|
server_name: &str,
|
|
request_id: &RequestId,
|
|
) -> Option<oneshot::Sender<ElicitationResponse>> {
|
|
self.pending_elicitations
|
|
.remove(&(server_name.to_string(), request_id.clone()))
|
|
}
|
|
|
|
pub(crate) fn insert_pending_dynamic_tool(
|
|
&mut self,
|
|
key: String,
|
|
tx: oneshot::Sender<DynamicToolResponse>,
|
|
) -> Option<oneshot::Sender<DynamicToolResponse>> {
|
|
self.pending_dynamic_tools.insert(key, tx)
|
|
}
|
|
|
|
pub(crate) fn remove_pending_dynamic_tool(
|
|
&mut self,
|
|
key: &str,
|
|
) -> Option<oneshot::Sender<DynamicToolResponse>> {
|
|
self.pending_dynamic_tools.remove(key)
|
|
}
|
|
|
|
pub(crate) fn push_pending_input(&mut self, input: ResponseInputItem) {
|
|
self.pending_input.push(input);
|
|
}
|
|
|
|
pub(crate) fn prepend_pending_input(&mut self, mut input: Vec<ResponseInputItem>) {
|
|
if input.is_empty() {
|
|
return;
|
|
}
|
|
|
|
input.append(&mut self.pending_input);
|
|
self.pending_input = input;
|
|
}
|
|
|
|
pub(crate) fn take_pending_input(&mut self) -> Vec<ResponseInputItem> {
|
|
if self.pending_input.is_empty() {
|
|
Vec::with_capacity(0)
|
|
} else {
|
|
let mut ret = Vec::new();
|
|
std::mem::swap(&mut ret, &mut self.pending_input);
|
|
ret
|
|
}
|
|
}
|
|
|
|
pub(crate) fn has_pending_input(&self) -> bool {
|
|
!self.pending_input.is_empty()
|
|
}
|
|
|
|
pub(crate) fn accept_mailbox_delivery_for_current_turn(&mut self) {
|
|
self.set_mailbox_delivery_phase(MailboxDeliveryPhase::CurrentTurn);
|
|
}
|
|
|
|
pub(crate) fn accepts_mailbox_delivery_for_current_turn(&self) -> bool {
|
|
self.mailbox_delivery_phase == MailboxDeliveryPhase::CurrentTurn
|
|
}
|
|
|
|
pub(crate) fn set_mailbox_delivery_phase(&mut self, phase: MailboxDeliveryPhase) {
|
|
self.mailbox_delivery_phase = phase;
|
|
}
|
|
|
|
pub(crate) fn record_granted_permissions(&mut self, permissions: PermissionProfile) {
|
|
self.granted_permissions =
|
|
merge_permission_profiles(self.granted_permissions.as_ref(), Some(&permissions));
|
|
}
|
|
|
|
pub(crate) fn granted_permissions(&self) -> Option<PermissionProfile> {
|
|
self.granted_permissions.clone()
|
|
}
|
|
}
|
|
|
|
impl ActiveTurn {
|
|
/// Clear any pending approvals and input buffered for the current turn.
|
|
pub(crate) async fn clear_pending(&self) {
|
|
let mut ts = self.turn_state.lock().await;
|
|
ts.clear_pending();
|
|
}
|
|
}
|