mirror of
https://github.com/openai/codex.git
synced 2026-10-27 18:48:37 +00:00
jif
4e6d5c0a96
## What changed - Move assessment event construction, metrics, and analytics tracking into `codex-guardian-reviewer` through `ReviewReport`. - Store denial accounting in thread extension data through `ReviewDenials`, with core retaining turn interruption and lifecycle cleanup. - Move failed-review record selection and bounded serialization into the extension, with core supplying captured review context. ## Testing Add coverage that denial accounting clears on turn completion and interruption. Move the oversized-record test into the extension and exercise the new API. GitOrigin-RevId: 6e5b3d9d4128b356f99b1d0e74a68111e40261ab
101 lines
4.7 KiB
Rust
101 lines
4.7 KiB
Rust
use std::path::PathBuf;
|
|
use std::sync::Arc;
|
|
|
|
use crate::agent::AgentControl;
|
|
use crate::agents_md_manager::AgentsMdManager;
|
|
use crate::attestation::AttestationProvider;
|
|
use crate::client::ModelClient;
|
|
use crate::config::NetworkProxyAuditMetadata;
|
|
use crate::config::StartedNetworkProxy;
|
|
use crate::current_time::TimeProvider;
|
|
use crate::elicitation::ElicitationService;
|
|
use crate::environment_selection::ThreadEnvironments;
|
|
use crate::exec_policy::ExecPolicyManager;
|
|
use crate::mcp::McpManager;
|
|
use crate::mcp_tool_exposure::McpHandlerCache;
|
|
use crate::tools::ExecutedToolCalls;
|
|
use crate::tools::code_mode::CodeModeService;
|
|
use crate::tools::handlers::ToolSearchHandlerCache;
|
|
use crate::tools::network_approval::NetworkApprovalService;
|
|
use crate::tools::sandboxing::ApprovalStore;
|
|
use crate::unified_exec::UnifiedExecProcessManager;
|
|
use arc_swap::ArcSwap;
|
|
use arc_swap::ArcSwapOption;
|
|
use codex_analytics::AnalyticsEventsClient;
|
|
use codex_core_plugins::PluginsManager;
|
|
use codex_extension_api::ExtensionData;
|
|
use codex_extension_api::ExtensionDataInit;
|
|
use codex_extension_api::ExtensionRegistry;
|
|
use codex_hooks::Hooks;
|
|
use codex_http_client::RouteAwareClientPool;
|
|
use codex_login::AuthManager;
|
|
use codex_mcp::McpRuntime;
|
|
use codex_models_manager::manager::SharedModelsManager;
|
|
use codex_otel::SessionTelemetry;
|
|
use codex_protocol::capabilities::SelectedCapabilityRoot;
|
|
use codex_protocol::mcp::ClientMcpExtensions;
|
|
use codex_rollout::state_db::StateDbHandle;
|
|
use codex_rollout_trace::ThreadTraceContext;
|
|
use codex_skills_extension::HostSkillsService;
|
|
use codex_thread_store::LiveThread;
|
|
use codex_thread_store::ThreadStore;
|
|
use codex_utils_git_discovery::GitRootDiscovery;
|
|
use tokio::runtime::Handle;
|
|
use tokio::sync::Mutex;
|
|
|
|
pub(crate) struct SessionServices {
|
|
/// The single owner of live MCP connections for this thread.
|
|
pub(crate) mcp_runtime: Arc<McpRuntime>,
|
|
/// Immutable MCP handlers scoped to this thread's current binding.
|
|
pub(crate) mcp_handler_cache: McpHandlerCache,
|
|
pub(crate) unified_exec_manager: UnifiedExecProcessManager,
|
|
pub(crate) elicitations: ElicitationService,
|
|
#[cfg_attr(not(unix), allow(dead_code))]
|
|
pub(crate) shell_zsh_path: Option<PathBuf>,
|
|
#[cfg_attr(not(unix), allow(dead_code))]
|
|
pub(crate) main_execve_wrapper_exe: Option<PathBuf>,
|
|
pub(crate) analytics_events_client: AnalyticsEventsClient,
|
|
pub(crate) hooks: ArcSwap<Hooks>,
|
|
pub(crate) rollout_thread_trace: ThreadTraceContext,
|
|
pub(crate) user_shell: Arc<crate::shell::Shell>,
|
|
pub(crate) show_raw_agent_reasoning: bool,
|
|
pub(crate) exec_policy: Arc<ExecPolicyManager>,
|
|
pub(crate) auth_manager: Arc<AuthManager>,
|
|
/// Upload-only clients shared across turns without logging signed blob URLs.
|
|
pub(crate) openai_file_upload_client_pool: RouteAwareClientPool,
|
|
pub(crate) models_manager: SharedModelsManager,
|
|
pub(crate) git_root_discovery: Arc<GitRootDiscovery>,
|
|
pub(crate) session_telemetry: SessionTelemetry,
|
|
pub(crate) tool_approvals: Mutex<ApprovalStore>,
|
|
pub(crate) runtime_handle: Handle,
|
|
pub(crate) skills_service: Arc<HostSkillsService>,
|
|
pub(crate) agents_md_manager: Arc<AgentsMdManager>,
|
|
pub(crate) plugins_manager: Arc<PluginsManager>,
|
|
pub(crate) mcp_manager: Arc<McpManager>,
|
|
pub(crate) extensions: Arc<ExtensionRegistry<crate::config::Config>>,
|
|
pub(crate) session_extension_data: ExtensionData,
|
|
pub(crate) thread_extension_data: ExtensionData,
|
|
/// MCP extensions fixed when this session is created.
|
|
pub(crate) client_mcp_extensions: ClientMcpExtensions,
|
|
/// Raw capability selections for this thread. Each model step resolves them against its
|
|
/// current executor environments before using them.
|
|
pub(crate) selected_capability_roots: Vec<SelectedCapabilityRoot>,
|
|
pub(crate) mcp_thread_init: ExtensionDataInit,
|
|
pub(crate) agent_control: AgentControl,
|
|
pub(crate) network_proxy: ArcSwapOption<StartedNetworkProxy>,
|
|
pub(crate) network_proxy_audit_metadata: NetworkProxyAuditMetadata,
|
|
pub(crate) managed_network_requirements_configured: bool,
|
|
pub(crate) network_approval: Arc<NetworkApprovalService>,
|
|
pub(crate) state_db: Option<StateDbHandle>,
|
|
pub(crate) live_thread: Option<LiveThread>,
|
|
pub(crate) thread_store: Arc<dyn ThreadStore>,
|
|
pub(crate) attestation_provider: Option<Arc<dyn AttestationProvider>>,
|
|
pub(crate) time_provider: Arc<dyn TimeProvider>,
|
|
/// Session-scoped model client shared across turns.
|
|
pub(crate) model_client: ModelClient,
|
|
pub(crate) executed_tool_calls: ExecutedToolCalls,
|
|
pub(crate) code_mode_service: CodeModeService,
|
|
pub(crate) tool_search_handler_cache: ToolSearchHandlerCache,
|
|
pub(crate) turn_environments: Arc<ThreadEnvironments>,
|
|
}
|