mirror of
https://github.com/openai/codex.git
synced 2026-10-29 00:06:55 +00:00
Bryan Ashley
08e30a2e4e
## Why Selected capability roots can contribute plugins, MCP servers, connectors, and skills. Discovering each contribution separately requires repeated access to the executor filesystem. ## What changed - Add the `capabilityRoots/discoverV1` exec-server RPC to scan selected roots and materialize recognized plugin manifests, configuration files, skill instructions, and skill metadata in one bounded request. - Add the opt-in `executor_capability_discovery` feature, with a thread-scoped cache and per-step snapshot shared by MCP and skill discovery. - Parse MCP, connector, and skill contributions from the materialized snapshot, including serving cached skill instructions without another filesystem read. ## Testing - Cover discovery limits, manifest precedence, root-local failures, cache reuse, plugin contributions, and parity with the existing environment skill loader. GitOrigin-RevId: f98fd2321cafb58c596db02da1f83c09d8eb375d
55 lines
2.1 KiB
Rust
55 lines
2.1 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::ExecutorCapabilityDiscoverySnapshot;
|
|
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>,
|
|
/// Executor-materialized capability files shared by MCP and skills in this exact step.
|
|
pub(crate) executor_capability_discovery: Option<Arc<ExecutorCapabilityDiscoverySnapshot>>,
|
|
/// 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>,
|
|
executor_capability_discovery: Option<Arc<ExecutorCapabilityDiscoverySnapshot>>,
|
|
mcp: Arc<McpRuntimeSnapshot>,
|
|
loaded_agents_md: Option<Arc<LoadedAgentsMd>>,
|
|
) -> Self {
|
|
Self {
|
|
turn,
|
|
environments,
|
|
selected_capability_roots,
|
|
executor_capability_discovery,
|
|
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
|
|
}
|
|
}
|