mirror of
https://github.com/openai/codex.git
synced 2026-11-03 00:21:31 +00:00
Adam Perry @ OpenAI
bf667c7003
## Why We already have the machinery to support multiple environments on a single thread, but we only show the model the contents of `AGENTS.md` files in the primary environment. We should show the model all of the relevant project instructions when we know there's more than one environment. ## Known Gaps As discussed in the RFC, this implementation: 1. doesn't handle environments being added/removed to/from the thread after its creation 2. it doesn't enforce an aggregate context budget across environments, and instead applies the configured project maximum independently to each environment ## Implementation - Discover project instructions in environment order with an independent byte budget per environment and preserve source provenance/order. - Keep the legacy fragment byte-for-byte when exactly one environment contributes project instructions; use environment-labeled sections when two or more environments contribute. - Freeze the complete rendered fragment in `LoadedAgentsMd`, insert it directly into requests, and recognize both layouts in contextual and memory filtering. - Add exact rendering, independent-budget, source-order, creation-snapshot, and consumer coverage without changing app-server schemas.
98 lines
3.4 KiB
Rust
98 lines
3.4 KiB
Rust
use codex_features::Feature;
|
|
use codex_utils_path_uri::PathUri;
|
|
use core_test_support::responses::ev_completed;
|
|
use core_test_support::responses::ev_response_created;
|
|
use core_test_support::responses::mount_sse_once;
|
|
use core_test_support::responses::sse;
|
|
use core_test_support::responses::start_mock_server;
|
|
use core_test_support::test_codex::test_codex;
|
|
|
|
const HIERARCHICAL_AGENTS_SNIPPET: &str =
|
|
"Files called AGENTS.md commonly appear in many places inside a container";
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn hierarchical_agents_appends_to_project_doc_in_user_instructions() {
|
|
let server = start_mock_server().await;
|
|
let resp_mock = mount_sse_once(
|
|
&server,
|
|
sse(vec![ev_response_created("resp1"), ev_completed("resp1")]),
|
|
)
|
|
.await;
|
|
|
|
let mut builder = test_codex()
|
|
.with_config(|config| {
|
|
config
|
|
.features
|
|
.enable(Feature::ChildAgentsMd)
|
|
.expect("test config should allow feature update");
|
|
})
|
|
.with_workspace_setup(|cwd, fs| async move {
|
|
let agents_md = cwd.join("AGENTS.md");
|
|
let agents_md_uri = PathUri::from_path(&agents_md)?;
|
|
fs.write_file(&agents_md_uri, b"be nice".to_vec(), /*sandbox*/ None)
|
|
.await?;
|
|
Ok::<(), anyhow::Error>(())
|
|
});
|
|
let test = builder
|
|
.build_with_remote_env(&server)
|
|
.await
|
|
.expect("build test codex");
|
|
|
|
test.submit_turn("hello").await.expect("submit turn");
|
|
|
|
let request = resp_mock.single_request();
|
|
let user_messages = request.message_input_texts("user");
|
|
let instructions = user_messages
|
|
.iter()
|
|
.find(|text| text.starts_with("# AGENTS.md instructions"))
|
|
.expect("instructions message");
|
|
assert!(
|
|
instructions.contains("be nice"),
|
|
"expected AGENTS.md text included: {instructions}"
|
|
);
|
|
let snippet_pos = instructions
|
|
.find(HIERARCHICAL_AGENTS_SNIPPET)
|
|
.expect("expected hierarchical agents snippet");
|
|
let base_pos = instructions
|
|
.find("be nice")
|
|
.expect("expected AGENTS.md text");
|
|
assert!(
|
|
snippet_pos > base_pos,
|
|
"expected hierarchical agents message appended after base instructions: {instructions}"
|
|
);
|
|
}
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn hierarchical_agents_emits_when_no_project_doc() {
|
|
let server = start_mock_server().await;
|
|
let resp_mock = mount_sse_once(
|
|
&server,
|
|
sse(vec![ev_response_created("resp1"), ev_completed("resp1")]),
|
|
)
|
|
.await;
|
|
|
|
let mut builder = test_codex().with_config(|config| {
|
|
config
|
|
.features
|
|
.enable(Feature::ChildAgentsMd)
|
|
.expect("test config should allow feature update");
|
|
});
|
|
let test = builder
|
|
.build_with_remote_env(&server)
|
|
.await
|
|
.expect("build test codex");
|
|
|
|
test.submit_turn("hello").await.expect("submit turn");
|
|
|
|
let request = resp_mock.single_request();
|
|
let user_messages = request.message_input_texts("user");
|
|
let instructions = user_messages
|
|
.iter()
|
|
.find(|text| text.starts_with("# AGENTS.md instructions"))
|
|
.expect("instructions message");
|
|
assert!(
|
|
instructions.contains(HIERARCHICAL_AGENTS_SNIPPET),
|
|
"expected hierarchical agents message appended: {instructions}"
|
|
);
|
|
}
|