mirror of
https://github.com/openai/codex.git
synced 2026-11-18 22:20:48 +00:00
Follow-up to #30226. ## Why #30226 makes Apps World State inspect the MCP tool list, while tool-router construction reads the same list again later in the sampling request. `list_all_tools()` walks the MCP clients and may reconnect or wait for tools, so doing that work twice adds latency and lets context and tool construction observe different MCP states for one request. ## What - Add a lazy MCP tool snapshot to `StepContext`. - Reuse that snapshot for Apps World State and tool-router construction. - Let each new `StepContext` refresh naturally for the next sampling request, without manager-level caching or invalidation. ## Testing - `just test -p codex-core apps_instructions` - `just test -p codex-core apps_guidance_appears_after_background_recovery_within_a_turn`
50 lines
1.7 KiB
Rust
50 lines
1.7 KiB
Rust
use std::sync::Arc;
|
|
|
|
use crate::agents_md::LoadedAgentsMd;
|
|
use crate::environment_selection::TurnEnvironmentSnapshot;
|
|
use crate::session::McpRuntimeSnapshot;
|
|
use crate::session::turn_context::TurnContext;
|
|
use codex_exec_server::ResolvedSelectedCapabilityRoot;
|
|
use codex_mcp::ToolInfo;
|
|
use tokio::sync::OnceCell;
|
|
|
|
/// Request-scoped state that may change between model sampling requests.
|
|
#[derive(Debug)]
|
|
pub(crate) struct StepContext {
|
|
pub(crate) turn: Arc<TurnContext>,
|
|
pub(crate) environments: TurnEnvironmentSnapshot,
|
|
/// Capability roots bound to ready environments in this exact step.
|
|
pub(crate) selected_capability_roots: Vec<ResolvedSelectedCapabilityRoot>,
|
|
/// The exact MCP config and manager used to advertise and execute tools for this step.
|
|
pub(crate) mcp: Arc<McpRuntimeSnapshot>,
|
|
/// The fixed MCP tool list used for this exact sampling request.
|
|
mcp_tool_snapshot: OnceCell<Vec<ToolInfo>>,
|
|
/// The canonical AGENTS.md value observed with this environment snapshot.
|
|
pub(crate) loaded_agents_md: Option<Arc<LoadedAgentsMd>>,
|
|
}
|
|
|
|
impl StepContext {
|
|
pub(crate) fn new(
|
|
turn: Arc<TurnContext>,
|
|
environments: TurnEnvironmentSnapshot,
|
|
selected_capability_roots: Vec<ResolvedSelectedCapabilityRoot>,
|
|
mcp: Arc<McpRuntimeSnapshot>,
|
|
loaded_agents_md: Option<Arc<LoadedAgentsMd>>,
|
|
) -> Self {
|
|
Self {
|
|
turn,
|
|
environments,
|
|
selected_capability_roots,
|
|
mcp,
|
|
mcp_tool_snapshot: OnceCell::new(),
|
|
loaded_agents_md,
|
|
}
|
|
}
|
|
|
|
pub(crate) async fn mcp_tools(&self) -> &[ToolInfo] {
|
|
self.mcp_tool_snapshot
|
|
.get_or_init(|| self.mcp.manager().list_all_tools())
|
|
.await
|
|
}
|
|
}
|