mirror of
https://github.com/openai/codex.git
synced 2026-10-24 18:18:41 +00:00
pakrym-oai
022f1221e8
## Why Shell snapshots are currently session-scoped even though shell and cwd are properties of a selected turn environment. That makes snapshot refresh depend on separate session-cwd plumbing, prevents retained environments from retaining their snapshot work, and can make snapshot construction use a different shell than command execution. This follows #27955 by making the retained thread-environment service own environment snapshot lifecycles. Session configuration remains the requested selection state, while `ThreadEnvironments` remains the source of successfully resolved environments. ## What changed - Configure the shell-snapshot builder before initial environment resolution. - Start each local environment snapshot task when its `TurnEnvironment` is built and retain that shared task while environment ID and cwd still match. - Inherit retained environment snapshots into spawned child threads. - Carry the selected `TurnEnvironment` through shell runtimes so snapshot construction and command execution use the same environment-specific shell and cwd. - Load project instructions and warm plugins/skills after initial environment resolution. - Continue decoding invalid UTF-8 instruction files lossily without emitting a startup warning. - Keep requested selections in `SessionConfiguration`; failed or duplicate resolutions only affect the resolved environment snapshot. ## Validation - `cargo check -p codex-core --tests` - `just test -p codex-home instructions` (6 passed) - Focused environment, instruction, shell-snapshot, and user-shell tests (84 passed) - Focused shell-snapshot, user-shell, and unified-exec tests (126 passed; two event-timing tests passed on retry)
75 lines
2.5 KiB
Rust
75 lines
2.5 KiB
Rust
#![allow(clippy::expect_used, clippy::unwrap_used)]
|
|
|
|
use core_test_support::responses;
|
|
use core_test_support::test_codex_exec::test_codex_exec;
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn exec_includes_workspace_agents_md_in_request() -> anyhow::Result<()> {
|
|
let test = test_codex_exec();
|
|
std::fs::write(test.cwd_path().join("AGENTS.md"), "workspace instructions")?;
|
|
|
|
let server = responses::start_mock_server().await;
|
|
let body = responses::sse(vec![
|
|
responses::ev_response_created("resp1"),
|
|
responses::ev_assistant_message("m1", "fixture hello"),
|
|
responses::ev_completed("resp1"),
|
|
]);
|
|
let response_mock = responses::mount_sse_once(&server, body).await;
|
|
|
|
test.cmd_with_server(&server)
|
|
.arg("--skip-git-repo-check")
|
|
.arg("tell me something")
|
|
.assert()
|
|
.success();
|
|
|
|
let user_messages = response_mock.single_request().message_input_texts("user");
|
|
assert!(
|
|
user_messages
|
|
.iter()
|
|
.any(|text| text.contains("workspace instructions")),
|
|
"request should include workspace AGENTS.md instructions: {user_messages:?}"
|
|
);
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn exec_prefers_workspace_agents_override_md() -> anyhow::Result<()> {
|
|
let test = test_codex_exec();
|
|
std::fs::write(test.cwd_path().join("AGENTS.md"), "base instructions")?;
|
|
std::fs::write(
|
|
test.cwd_path().join("AGENTS.override.md"),
|
|
"override instructions",
|
|
)?;
|
|
|
|
let server = responses::start_mock_server().await;
|
|
let body = responses::sse(vec![
|
|
responses::ev_response_created("resp1"),
|
|
responses::ev_assistant_message("m1", "fixture hello"),
|
|
responses::ev_completed("resp1"),
|
|
]);
|
|
let response_mock = responses::mount_sse_once(&server, body).await;
|
|
|
|
test.cmd_with_server(&server)
|
|
.arg("--skip-git-repo-check")
|
|
.arg("tell me something")
|
|
.assert()
|
|
.success();
|
|
|
|
let user_messages = response_mock.single_request().message_input_texts("user");
|
|
assert!(
|
|
user_messages
|
|
.iter()
|
|
.any(|text| text.contains("override instructions")),
|
|
"request should include AGENTS.override.md instructions: {user_messages:?}"
|
|
);
|
|
assert!(
|
|
user_messages
|
|
.iter()
|
|
.all(|text| !text.contains("base instructions")),
|
|
"request should exclude shadowed AGENTS.md instructions: {user_messages:?}"
|
|
);
|
|
|
|
Ok(())
|
|
}
|