mirror of
https://github.com/openai/codex.git
synced 2026-04-26 23:55:25 +00:00
## Why Enterprises can already constrain approvals, sandboxing, and web search through `requirements.toml` and MDM, but feature flags were still only configurable as managed defaults. That meant an enterprise could suggest feature values, but it could not actually pin them. This change closes that gap and makes enterprise feature requirements behave like the other constrained settings. The effective feature set now stays consistent with enterprise requirements during config load, when config writes are validated, and when runtime code mutates feature flags later in the session. It also tightens the runtime API for managed features. `ManagedFeatures` now follows the same constraint-oriented shape as `Constrained<T>` instead of exposing panic-prone mutation helpers, and production code can no longer construct it through an unconstrained `From<Features>` path. The PR also hardens the `compact_resume_fork` integration coverage on Windows. After the feature-management changes, `compact_resume_after_second_compaction_preserves_history` was overflowing the libtest/Tokio thread stacks on Windows, so the test now uses an explicit larger-stack harness as a pragmatic mitigation. That may not be the ideal root-cause fix, and it merits a parallel investigation into whether part of the async future chain should be boxed to reduce stack pressure instead. ## What Changed Enterprises can now pin feature values in `requirements.toml` with the requirements-side `features` table: ```toml [features] personality = true unified_exec = false ``` Only canonical feature keys are allowed in the requirements `features` table; omitted keys remain unconstrained. - Added a requirements-side pinned feature map to `ConfigRequirementsToml`, threaded it through source-preserving requirements merge and normalization in `codex-config`, and made the TOML surface use `[features]` (while still accepting legacy `[feature_requirements]` for compatibility). - Exposed `featureRequirements` from `configRequirements/read`, regenerated the JSON/TypeScript schema artifacts, and updated the app-server README. - Wrapped the effective feature set in `ManagedFeatures`, backed by `ConstrainedWithSource<Features>`, and changed its API to mirror `Constrained<T>`: `can_set(...)`, `set(...) -> ConstraintResult<()>`, and result-returning `enable` / `disable` / `set_enabled` helpers. - Removed the legacy-usage and bulk-map passthroughs from `ManagedFeatures`; callers that need those behaviors now mutate a plain `Features` value and reapply it through `set(...)`, so the constrained wrapper remains the enforcement boundary. - Removed the production loophole for constructing unconstrained `ManagedFeatures`. Non-test code now creates it through the configured feature-loading path, and `impl From<Features> for ManagedFeatures` is restricted to `#[cfg(test)]`. - Rejected legacy feature aliases in enterprise feature requirements, and return a load error when a pinned combination cannot survive dependency normalization. - Validated config writes against enterprise feature requirements before persisting changes, including explicit conflicting writes and profile-specific feature states that normalize into invalid combinations. - Updated runtime and TUI feature-toggle paths to use the constrained setter API and to persist or apply the effective post-constraint value rather than the requested value. - Updated the `core_test_support` Bazel target to include the bundled core model-catalog fixtures in its runtime data, so helper code that resolves `core/models.json` through runfiles works in remote Bazel test environments. - Renamed the core config test coverage to emphasize that effective feature values are normalized at runtime, while conflicting persisted config writes are rejected. - Ran `compact_resume_after_second_compaction_preserves_history` inside an explicit 8 MiB test thread and Tokio runtime worker stack, following the existing larger-stack integration-test pattern, to keep the Windows `compact_resume_fork` test slice from aborting while a parallel investigation continues into whether some of the underlying async futures should be boxed. ## Verification - `cargo test -p codex-config` - `cargo test -p codex-core feature_requirements_ -- --nocapture` - `cargo test -p codex-core load_requirements_toml_produces_expected_constraints -- --nocapture` - `cargo test -p codex-core compact_resume_after_second_compaction_preserves_history -- --nocapture` - `cargo test -p codex-core compact_resume_fork -- --nocapture` - Re-ran the built `codex-core` `tests/all` binary with `RUST_MIN_STACK=262144` for `compact_resume_after_second_compaction_preserves_history` to confirm the explicit-stack harness fixes the deterministic low-stack repro. - `cargo test -p codex-core` - This still fails locally in unrelated integration areas that expect the `codex` / `test_stdio_server` binaries or hit existing `search_tool` wiremock mismatches. ## Docs `developers.openai.com/codex` should document the requirements-side `[features]` table for enterprise and MDM-managed configuration, including that it only accepts canonical feature keys and that conflicting config writes are rejected.
315 lines
9.7 KiB
Rust
315 lines
9.7 KiB
Rust
use std::time::Duration;
|
|
|
|
use anyhow::Result;
|
|
use codex_core::features::Feature;
|
|
use core_test_support::assert_regex_match;
|
|
use core_test_support::responses::ev_assistant_message;
|
|
use core_test_support::responses::ev_completed;
|
|
use core_test_support::responses::ev_function_call;
|
|
use core_test_support::responses::ev_response_created;
|
|
use core_test_support::responses::mount_sse_sequence;
|
|
use core_test_support::responses::sse;
|
|
use core_test_support::skip_if_no_network;
|
|
use core_test_support::skip_if_windows;
|
|
use core_test_support::test_codex::TestCodexBuilder;
|
|
use core_test_support::test_codex::TestCodexHarness;
|
|
use core_test_support::test_codex::test_codex;
|
|
use serde_json::json;
|
|
use test_case::test_case;
|
|
|
|
#[cfg(windows)]
|
|
const DEFAULT_SHELL_TIMEOUT_MS: i64 = 7_000;
|
|
#[cfg(not(windows))]
|
|
const DEFAULT_SHELL_TIMEOUT_MS: i64 = 2_000;
|
|
|
|
#[cfg(windows)]
|
|
const MEDIUM_TIMEOUT: Duration = Duration::from_secs(10);
|
|
#[cfg(not(windows))]
|
|
const MEDIUM_TIMEOUT: Duration = Duration::from_secs(5);
|
|
|
|
fn shell_responses_with_timeout(
|
|
call_id: &str,
|
|
command: &str,
|
|
login: Option<bool>,
|
|
timeout_ms: i64,
|
|
) -> Vec<String> {
|
|
let args = json!({
|
|
"command": command,
|
|
"timeout_ms": timeout_ms,
|
|
"login": login,
|
|
});
|
|
|
|
#[allow(clippy::expect_used)]
|
|
let arguments = serde_json::to_string(&args).expect("serialize shell command arguments");
|
|
|
|
vec![
|
|
sse(vec![
|
|
ev_response_created("resp-1"),
|
|
ev_function_call(call_id, "shell_command", &arguments),
|
|
ev_completed("resp-1"),
|
|
]),
|
|
sse(vec![
|
|
ev_assistant_message("msg-1", "done"),
|
|
ev_completed("resp-2"),
|
|
]),
|
|
]
|
|
}
|
|
|
|
fn shell_responses(call_id: &str, command: &str, login: Option<bool>) -> Vec<String> {
|
|
shell_responses_with_timeout(call_id, command, login, DEFAULT_SHELL_TIMEOUT_MS)
|
|
}
|
|
|
|
async fn shell_command_harness_with(
|
|
configure: impl FnOnce(TestCodexBuilder) -> TestCodexBuilder,
|
|
) -> Result<TestCodexHarness> {
|
|
let builder = configure(test_codex()).with_config(|config| {
|
|
config.include_apply_patch_tool = true;
|
|
});
|
|
TestCodexHarness::with_builder(builder).await
|
|
}
|
|
|
|
async fn mount_shell_responses(
|
|
harness: &TestCodexHarness,
|
|
call_id: &str,
|
|
command: &str,
|
|
login: Option<bool>,
|
|
) {
|
|
mount_sse_sequence(harness.server(), shell_responses(call_id, command, login)).await;
|
|
}
|
|
|
|
async fn mount_shell_responses_with_timeout(
|
|
harness: &TestCodexHarness,
|
|
call_id: &str,
|
|
command: &str,
|
|
login: Option<bool>,
|
|
timeout: Duration,
|
|
) {
|
|
mount_sse_sequence(
|
|
harness.server(),
|
|
shell_responses_with_timeout(call_id, command, login, timeout.as_millis() as i64),
|
|
)
|
|
.await;
|
|
}
|
|
|
|
fn assert_shell_command_output(output: &str, expected: &str) -> Result<()> {
|
|
let normalized_output = output
|
|
.replace("\r\n", "\n")
|
|
.replace('\r', "\n")
|
|
.trim_end_matches('\n')
|
|
.to_string();
|
|
|
|
let expected_pattern = format!(
|
|
r"(?s)^Exit code: 0\nWall time: [0-9]+(?:\.[0-9]+)? seconds\nOutput:\n{expected}\n?$"
|
|
);
|
|
|
|
assert_regex_match(&expected_pattern, &normalized_output);
|
|
Ok(())
|
|
}
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn shell_command_works() -> anyhow::Result<()> {
|
|
skip_if_no_network!(Ok(()));
|
|
|
|
let harness = shell_command_harness_with(|builder| builder.with_model("gpt-5.1")).await?;
|
|
|
|
let call_id = "shell-command-call";
|
|
mount_shell_responses(&harness, call_id, "echo 'hello, world'", None).await;
|
|
harness.submit("run the echo command").await?;
|
|
|
|
let output = harness.function_call_stdout(call_id).await;
|
|
assert_shell_command_output(&output, "hello, world")?;
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn output_with_login() -> anyhow::Result<()> {
|
|
skip_if_no_network!(Ok(()));
|
|
|
|
let harness = shell_command_harness_with(|builder| builder.with_model("gpt-5.1")).await?;
|
|
|
|
let call_id = "shell-command-call-login-true";
|
|
mount_shell_responses(&harness, call_id, "echo 'hello, world'", Some(true)).await;
|
|
harness.submit("run the echo command with login").await?;
|
|
|
|
let output = harness.function_call_stdout(call_id).await;
|
|
assert_shell_command_output(&output, "hello, world")?;
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn output_without_login() -> anyhow::Result<()> {
|
|
skip_if_no_network!(Ok(()));
|
|
|
|
let harness = shell_command_harness_with(|builder| builder.with_model("gpt-5.1")).await?;
|
|
|
|
let call_id = "shell-command-call-login-false";
|
|
mount_shell_responses(&harness, call_id, "echo 'hello, world'", Some(false)).await;
|
|
harness.submit("run the echo command without login").await?;
|
|
|
|
let output = harness.function_call_stdout(call_id).await;
|
|
assert_shell_command_output(&output, "hello, world")?;
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn multi_line_output_with_login() -> anyhow::Result<()> {
|
|
skip_if_no_network!(Ok(()));
|
|
|
|
let harness = shell_command_harness_with(|builder| builder.with_model("gpt-5.1")).await?;
|
|
|
|
let call_id = "shell-command-call-first-extra-login";
|
|
mount_shell_responses(
|
|
&harness,
|
|
call_id,
|
|
"echo 'first line\nsecond line'",
|
|
Some(true),
|
|
)
|
|
.await;
|
|
harness.submit("run the command with login").await?;
|
|
|
|
let output = harness.function_call_stdout(call_id).await;
|
|
assert_shell_command_output(&output, "first line\nsecond line")?;
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn pipe_output_with_login() -> anyhow::Result<()> {
|
|
skip_if_no_network!(Ok(()));
|
|
skip_if_windows!(Ok(()));
|
|
|
|
let harness = shell_command_harness_with(|builder| builder.with_model("gpt-5.1")).await?;
|
|
|
|
let call_id = "shell-command-call-second-extra-no-login";
|
|
mount_shell_responses(&harness, call_id, "echo 'hello, world' | cat", None).await;
|
|
harness.submit("run the command without login").await?;
|
|
|
|
let output = harness.function_call_stdout(call_id).await;
|
|
assert_shell_command_output(&output, "hello, world")?;
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn pipe_output_without_login() -> anyhow::Result<()> {
|
|
skip_if_no_network!(Ok(()));
|
|
skip_if_windows!(Ok(()));
|
|
|
|
let harness = shell_command_harness_with(|builder| builder.with_model("gpt-5.1")).await?;
|
|
|
|
let call_id = "shell-command-call-third-extra-login-false";
|
|
mount_shell_responses(&harness, call_id, "echo 'hello, world' | cat", Some(false)).await;
|
|
harness.submit("run the command without login").await?;
|
|
|
|
let output = harness.function_call_stdout(call_id).await;
|
|
assert_shell_command_output(&output, "hello, world")?;
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn shell_command_times_out_with_timeout_ms() -> anyhow::Result<()> {
|
|
skip_if_no_network!(Ok(()));
|
|
|
|
let harness = shell_command_harness_with(|builder| builder.with_model("gpt-5.1")).await?;
|
|
let call_id = "shell-command-timeout";
|
|
let command = if cfg!(windows) {
|
|
"timeout /t 5"
|
|
} else {
|
|
"sleep 5"
|
|
};
|
|
mount_shell_responses_with_timeout(
|
|
&harness,
|
|
call_id,
|
|
command,
|
|
None,
|
|
Duration::from_millis(200),
|
|
)
|
|
.await;
|
|
harness
|
|
.submit("run a long command with a short timeout")
|
|
.await?;
|
|
|
|
let output = harness.function_call_stdout(call_id).await;
|
|
let normalized_output = output
|
|
.replace("\r\n", "\n")
|
|
.replace('\r', "\n")
|
|
.trim_end_matches('\n')
|
|
.to_string();
|
|
let expected_pattern = r"(?s)^Exit code: 124\nWall time: [0-9]+(?:\.[0-9]+)? seconds\nOutput:\ncommand timed out after [0-9]+ milliseconds\n?$";
|
|
assert_regex_match(expected_pattern, &normalized_output);
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
#[test_case(true ; "with_login")]
|
|
#[test_case(false ; "without_login")]
|
|
async fn unicode_output(login: bool) -> anyhow::Result<()> {
|
|
skip_if_no_network!(Ok(()));
|
|
|
|
#[allow(clippy::expect_used)]
|
|
let harness = shell_command_harness_with(|builder| {
|
|
builder.with_model("gpt-5.2").with_config(|config| {
|
|
config
|
|
.features
|
|
.enable(Feature::PowershellUtf8)
|
|
.expect("test config should allow feature update");
|
|
})
|
|
})
|
|
.await?;
|
|
|
|
let call_id = "unicode_output";
|
|
mount_shell_responses_with_timeout(
|
|
&harness,
|
|
call_id,
|
|
"git -c alias.say='!printf \"%s\" \"naïve_café\"' say",
|
|
Some(login),
|
|
MEDIUM_TIMEOUT,
|
|
)
|
|
.await;
|
|
harness.submit("run the command without login").await?;
|
|
|
|
let output = harness.function_call_stdout(call_id).await;
|
|
assert_shell_command_output(&output, "naïve_café")?;
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
#[test_case(true ; "with_login")]
|
|
#[test_case(false ; "without_login")]
|
|
async fn unicode_output_with_newlines(login: bool) -> anyhow::Result<()> {
|
|
skip_if_no_network!(Ok(()));
|
|
|
|
#[allow(clippy::expect_used)]
|
|
let harness = shell_command_harness_with(|builder| {
|
|
builder.with_model("gpt-5.2").with_config(|config| {
|
|
config
|
|
.features
|
|
.enable(Feature::PowershellUtf8)
|
|
.expect("test config should allow feature update");
|
|
})
|
|
})
|
|
.await?;
|
|
|
|
let call_id = "unicode_output";
|
|
mount_shell_responses_with_timeout(
|
|
&harness,
|
|
call_id,
|
|
"echo 'line1\nnaïve café\nline3'",
|
|
Some(login),
|
|
MEDIUM_TIMEOUT,
|
|
)
|
|
.await;
|
|
harness.submit("run the command without login").await?;
|
|
|
|
let output = harness.function_call_stdout(call_id).await;
|
|
assert_shell_command_output(&output, "line1\\nnaïve café\\nline3")?;
|
|
|
|
Ok(())
|
|
}
|