mirror of
https://github.com/openai/codex.git
synced 2026-10-21 17:48:44 +00:00
Adam Perry @ OpenAI
42312d4ff4
## What changed - Accept per-environment `skills.required` lists through `environment/add` and `environments.toml`. - Before inference, require each named skill to be enabled and supplied by the selected environment. Missing skills fail the turn before a model request, including when environment setup fails. - Stop applying an environment's requirements after it is deselected. Exempt isolated Guardian reviewers, which have no skill catalog. ## Testing Add tests for available, missing, disabled, and wrong-environment skills, failed environment setup, recovery after deselection, and propagation of TOML requirements to the correct environment. GitOrigin-RevId: 302ced4774697d2f414f745fe0535e71f747eda2
67 lines
2.3 KiB
Rust
67 lines
2.3 KiB
Rust
use codex_http_client::HttpClientFactory;
|
|
|
|
use crate::EnvironmentManager;
|
|
use crate::ExecServerError;
|
|
use crate::ExecServerRuntimeOptions;
|
|
use crate::environment_provider::EnvironmentDefault;
|
|
use crate::environment_provider::EnvironmentProviderSnapshot;
|
|
use crate::remote::NoiseRendezvousEnvironmentConfig;
|
|
|
|
#[derive(Debug)]
|
|
pub(crate) enum PreparedEnvironmentSource {
|
|
Noise(NoiseRendezvousEnvironmentConfig),
|
|
Snapshot(EnvironmentProviderSnapshot),
|
|
}
|
|
|
|
/// Holds discovered execution environments before their HTTP policy is resolved.
|
|
///
|
|
/// Preparing environments does not start remote connections. Callers can inspect
|
|
/// the default environment to choose config-loading behavior and then build the
|
|
/// manager with the effective outbound HTTP policy.
|
|
#[derive(Debug)]
|
|
pub struct PreparedEnvironmentManager {
|
|
pub(crate) source: PreparedEnvironmentSource,
|
|
}
|
|
|
|
impl PreparedEnvironmentManager {
|
|
/// Returns whether the discovered default environment is remote.
|
|
pub fn default_environment_is_remote(&self) -> bool {
|
|
match &self.source {
|
|
PreparedEnvironmentSource::Noise(_) => true,
|
|
PreparedEnvironmentSource::Snapshot(snapshot) => match &snapshot.default {
|
|
EnvironmentDefault::Disabled => false,
|
|
EnvironmentDefault::EnvironmentId(default_id) => snapshot
|
|
.environments
|
|
.iter()
|
|
.any(|entry| &entry.id == default_id),
|
|
},
|
|
}
|
|
}
|
|
|
|
/// Builds the manager and starts remote connections using the supplied policy.
|
|
pub fn build(
|
|
self,
|
|
local_runtime_paths: Option<ExecServerRuntimeOptions>,
|
|
http_client_factory: HttpClientFactory,
|
|
) -> Result<EnvironmentManager, ExecServerError> {
|
|
match self.source {
|
|
PreparedEnvironmentSource::Noise(config) => {
|
|
EnvironmentManager::from_noise_environment_config(
|
|
config,
|
|
local_runtime_paths,
|
|
http_client_factory,
|
|
)
|
|
}
|
|
PreparedEnvironmentSource::Snapshot(snapshot) => EnvironmentManager::from_snapshot(
|
|
snapshot,
|
|
local_runtime_paths,
|
|
http_client_factory,
|
|
),
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
#[path = "environment_bootstrap_tests.rs"]
|
|
mod tests;
|