Skip to content

[codex] retain resolved environments across turns #27955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pakrym-oai merged 14 commits into from
Jun 15, 2026
Merged

[codex] retain resolved environments across turns #27955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
b4e6758
core: retain resolved turn environments
pakrym-oai Jun 12, 2026
f7c8157
core: resolve turn environments inside codex
pakrym-oai Jun 12, 2026
1d4e819
core: skip unresolved turn environments
pakrym-oai Jun 13, 2026
987bc42
core: update turn environments in place
pakrym-oai Jun 13, 2026
1a28680
codex: fix CI failure on PR #27955
pakrym-oai Jun 13, 2026
4c94d20
codex: fix CI failure on PR #27955
pakrym-oai Jun 13, 2026
c6481cb
codex: fix CI failure on PR #27955
pakrym-oai Jun 13, 2026
7a0b15b
core: move turn environments into session services
pakrym-oai Jun 15, 2026
56a40ee
core: reduce turn environment refactor churn
pakrym-oai Jun 15, 2026
f4c74a4
core: split thread environment initialization
pakrym-oai Jun 15, 2026
f5ea28c
fix(core): resolve latest thread environments eagerly
pakrym-oai Jun 15, 2026
b0970f9
refactor(core): simplify environment snapshot task
pakrym-oai Jun 15, 2026
23d0435
fix(core): publish environment task before spawning
pakrym-oai Jun 15, 2026
ee62610
refactor(core): simplify snapshot task storage
pakrym-oai Jun 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions codex-rs/core/src/agents_md.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
use crate::config::Config;
use crate::context::ContextualUserFragment;
use crate::context::UserInstructions as ContextUserInstructions;
use crate::environment_selection::ResolvedTurnEnvironments;
use crate::environment_selection::TurnEnvironmentSnapshot;
use codex_app_server_protocol::ConfigLayerSource;
use codex_config::ConfigLayerStackOrdering;
use codex_config::default_project_root_markers;
Expand Down Expand Up @@ -48,7 +48,7 @@ const AGENTS_MD_SEPARATOR: &str = "\n\n--- project-doc ---\n\n";
pub(crate) async fn load_project_instructions(
config: &mut Config,
user_instructions: Option<UserInstructions>,
environments: &ResolvedTurnEnvironments,
environments: &TurnEnvironmentSnapshot,
) -> Option<LoadedAgentsMd> {
let mut loaded = LoadedAgentsMd::from_user_instructions(user_instructions);
for turn_environment in &environments.turn_environments {
Expand Down
6 changes: 3 additions & 3 deletions codex-rs/core/src/agents_md_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use super::*;
use crate::config::ConfigBuilder;
use crate::environment_selection::ResolvedTurnEnvironments;
use crate::environment_selection::TurnEnvironmentSnapshot;
use crate::session::turn_context::TurnEnvironment;
use codex_config::ConfigLayerEntry;
use codex_config::ConfigLayerStack;
Expand Down Expand Up @@ -254,8 +254,8 @@ async fn agents_md_paths(config: &TestConfig) -> std::io::Result<Vec<AbsolutePat

fn resolved_local_environments<const N: usize>(
environments: [(&str, AbsolutePathBuf); N],
) -> ResolvedTurnEnvironments {
ResolvedTurnEnvironments {
) -> TurnEnvironmentSnapshot {
TurnEnvironmentSnapshot {
turn_environments: environments
.into_iter()
.map(|(environment_id, cwd)| {
Expand Down
7 changes: 5 additions & 2 deletions codex-rs/core/src/codex_delegate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,10 @@ pub(crate) async fn run_codex_thread_interactive(
installation_id: parent_session.installation_id.clone(),
auth_manager,
models_manager,
environment_manager: Arc::clone(&parent_session.services.environment_manager),
environment_manager: parent_session
.services
.turn_environments
.environment_manager(),
skills_manager: Arc::clone(&parent_session.services.skills_manager),
plugins_manager: Arc::clone(&parent_session.services.plugins_manager),
mcp_manager: Arc::clone(&parent_session.services.mcp_manager),
Expand All @@ -108,7 +111,7 @@ pub(crate) async fn run_codex_thread_interactive(
inherited_exec_policy: Some(Arc::clone(&parent_session.services.exec_policy)),
parent_rollout_thread_trace: codex_rollout_trace::ThreadTraceContext::disabled(),
parent_trace: None,
environment_selections: parent_ctx.environments.clone(),
environment_selections: parent_ctx.environments.to_selections(),

@chatgpt-codex-connector chatgpt-codex-connector Bot Jun 15, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Preserve parent environment handles for child spawn

Converting the parent's resolved environment snapshot back to ID/cwd selections makes the child re-resolve in Codex::spawn. If that remote ID was upserted after the turn began, the child can load AGENTS/skills and run in a different environment than the active parent context. guidance

Useful? React with 👍 / 👎.

thread_extension_init: codex_extension_api::ExtensionDataInit::default(),
analytics_events_client: Some(parent_session.services.analytics_events_client.clone()),
thread_store: Arc::clone(&parent_session.services.thread_store),
Expand Down
Loading
Loading