mirror of
https://github.com/openai/codex.git
synced 2026-11-15 21:50:46 +00:00
Separate local agent runtime state from controller handles (#47301)
## What changed Extract `LocalAgentRuntime` from `LocalAgentControl` to hold the shared registry, residency state, execution limiter, rollout budget, service tier, instruction provider, and thread-manager bindings. Keep session identity on the controller handle. Store the runtime in `SessionServices` and use it to bind controllers for child startup, resume, delegation, and guardian reviews. Route ownership checks and residency handling through the shared runtime, preserving registry identity across handles. Update existing test fixtures to keep the controller and runtime paired. GitOrigin-RevId: 846094657cbdf736da3149f0a1c96b4e01423dfe
This commit is contained in:
@@ -0,0 +1,69 @@
|
||||
//! Shared state and startup bindings for one local agent tree.
|
||||
//! Registry identity is allocation identity; cloning this handle preserves ownership checks.
|
||||
|
||||
use super::LocalAgentControl;
|
||||
use super::execution::AgentExecutionLimiter;
|
||||
use super::residency::V2Residency;
|
||||
use crate::agent::registry::AgentRegistry;
|
||||
use crate::config::RolloutBudgetConfig;
|
||||
use crate::rollout_budget::RolloutBudget;
|
||||
use crate::thread_manager::ThreadIdGenerator;
|
||||
use crate::thread_manager::ThreadManagerState;
|
||||
use arc_swap::ArcSwapOption;
|
||||
use codex_extension_api::ThreadInstructionsProvider;
|
||||
use codex_protocol::SessionId;
|
||||
use std::sync::Arc;
|
||||
use std::sync::OnceLock;
|
||||
use std::sync::Weak;
|
||||
|
||||
/// Local tree state, kept separate from the shared agent operation interface.
|
||||
#[derive(Clone)]
|
||||
pub(crate) struct LocalAgentRuntime {
|
||||
/// Weak handle back to the global thread registry/state.
|
||||
/// This is `Weak` to avoid reference cycles and shadow persistence of the form
|
||||
/// `ThreadManagerState -> CodexThread -> Session -> SessionServices -> ThreadManagerState`.
|
||||
pub(super) manager: Weak<ThreadManagerState>,
|
||||
/// Captured at construction so delegates retain their manager's allocation policy.
|
||||
pub(super) thread_id_generator: ThreadIdGenerator,
|
||||
pub(super) agent_execution_limiter: Arc<AgentExecutionLimiter>,
|
||||
/// Session-scoped state shared by the root thread and every cloned sub-agent control handle.
|
||||
pub(super) rollout_budget: Arc<RolloutBudget>,
|
||||
/// The user-selected root routing tier, shared by the entire agent tree.
|
||||
pub(super) root_service_tier: Arc<ArcSwapOption<String>>,
|
||||
/// Retains the root's opt-in instruction provider even when the root is unloaded.
|
||||
pub(super) shared_thread_instructions_provider:
|
||||
Arc<OnceLock<Arc<dyn ThreadInstructionsProvider>>>,
|
||||
pub(super) registry: Arc<AgentRegistry>,
|
||||
pub(super) residency: Arc<V2Residency>,
|
||||
}
|
||||
|
||||
impl LocalAgentRuntime {
|
||||
pub(super) fn new(
|
||||
manager: Weak<ThreadManagerState>,
|
||||
thread_id_generator: ThreadIdGenerator,
|
||||
rollout_budget: Option<RolloutBudgetConfig>,
|
||||
) -> Self {
|
||||
let runtime = Self {
|
||||
manager,
|
||||
thread_id_generator,
|
||||
registry: Arc::default(),
|
||||
residency: Arc::default(),
|
||||
agent_execution_limiter: Arc::default(),
|
||||
rollout_budget: Arc::default(),
|
||||
root_service_tier: Arc::new(ArcSwapOption::from(None)),
|
||||
shared_thread_instructions_provider: Arc::default(),
|
||||
};
|
||||
if let Some(rollout_budget) = rollout_budget {
|
||||
runtime.rollout_budget.configure(rollout_budget);
|
||||
}
|
||||
runtime
|
||||
}
|
||||
|
||||
/// Bind local startup to the same tree state with this session's identity.
|
||||
pub(crate) fn control(&self, session_id: SessionId) -> LocalAgentControl {
|
||||
LocalAgentControl {
|
||||
session_id,
|
||||
runtime: self.clone(),
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user