From 2fd8e29a39a61cb5334a848a76e1d5b36e12bdb6 Mon Sep 17 00:00:00 2001
From: pakrym-oai <pakrym@openai.com>
Date: Sat, 20 Jun 2026 12:55:09 -0700
Subject: [PATCH] codex: simplify legacy environment diffing (#29249)

---
 .../src/context/world_state/environment.rs    | 31 +++++------
 .../context/world_state/environment_tests.rs  | 55 +++++++++++++++----
 2 files changed, 58 insertions(+), 28 deletions(-)

diff --git a/codex-rs/core/src/context/world_state/environment.rs b/codex-rs/core/src/context/world_state/environment.rs
index 5d06e3b79e..65759a598d 100644
--- a/codex-rs/core/src/context/world_state/environment.rs
+++ b/codex-rs/core/src/context/world_state/environment.rs
@@ -4,6 +4,7 @@ use super::environment_support::NetworkContext;
 use super::environment_support::push_xml_escaped_text;
 use crate::context::ContextualUserFragment;
 use crate::session::turn_context::TurnContext;
+use codex_exec_server::LOCAL_ENVIRONMENT_ID;
 use codex_protocol::models::ResponseItem;
 use codex_protocol::protocol::TurnContextItem;
 use codex_protocol::protocol::TurnContextNetworkItem;
@@ -87,7 +88,7 @@ impl EnvironmentsState {
     pub(crate) fn from_turn_context_item(turn_context_item: &TurnContextItem) -> Self {
         Self {
             environments: [(
-                String::new(),
+                LOCAL_ENVIRONMENT_ID.to_string(),
                 EnvironmentState {
                     cwd: PathUri::from_abs_path(&turn_context_item.cwd),
                     status: Some(EnvironmentStatus::Available),
@@ -141,33 +142,27 @@ impl WorldStateSection for EnvironmentsState {
     const NAME: &'static str = "environments";
 
     fn render_diff(&self, previous: &Self) -> Option<ResponseItem> {
-        let legacy_single =
-            is_legacy_single(&self.environments) && previous.environments.len() <= 1;
         let turn_context_values_changed = self.current_date != previous.current_date
             || self.timezone != previous.timezone
             || self.network != previous.network
             || self.filesystem != previous.filesystem;
-        if legacy_single
-            && self.environments.values().next() == previous.environments.values().next()
-            && !turn_context_values_changed
-        {
-            return None;
-        }
         let mut updates = self
             .environments
             .iter()
             .filter(|(id, environment)| previous.environments.get(*id) != Some(*environment))
             .map(|(id, environment)| (id.clone(), EnvironmentUpdate::Current(environment.clone())))
             .collect::<BTreeMap<_, _>>();
-        if !legacy_single {
-            updates.extend(
-                previous
-                    .environments
-                    .keys()
-                    .filter(|id| !id.is_empty() && !self.environments.contains_key(*id))
-                    .map(|id| (id.clone(), EnvironmentUpdate::Unavailable)),
-            );
-        }
+        updates.extend(
+            previous
+                .environments
+                .keys()
+                .filter(|id| !self.environments.contains_key(*id))
+                .map(|id| (id.clone(), EnvironmentUpdate::Unavailable)),
+        );
+        let legacy_single = is_legacy_single(&self.environments)
+            && updates
+                .values()
+                .all(|update| matches!(update, EnvironmentUpdate::Current(_)));
         (!updates.is_empty() || turn_context_values_changed).then(|| {
             ContextualUserFragment::into(RenderedEnvironments {
                 updates,
diff --git a/codex-rs/core/src/context/world_state/environment_tests.rs b/codex-rs/core/src/context/world_state/environment_tests.rs
index 5941fb2b5c..0adf85223f 100644
--- a/codex-rs/core/src/context/world_state/environment_tests.rs
+++ b/codex-rs/core/src/context/world_state/environment_tests.rs
@@ -1,6 +1,7 @@
 use super::*;
 use crate::context::world_state::WorldState;
 use anyhow::Result;
+use codex_exec_server::LOCAL_ENVIRONMENT_ID;
 use codex_protocol::models::ContentItem;
 use codex_protocol::models::PermissionProfile;
 use codex_protocol::permissions::NetworkSandboxPolicy;
@@ -114,9 +115,12 @@ fn renders_only_changed_environments() -> Result<()> {
 #[test]
 fn persisted_turn_context_values_render_a_diff() -> Result<()> {
     let environments = EnvironmentsState {
-        environments: [("laptop".to_string(), available("file:///repo", "zsh")?)]
-            .into_iter()
-            .collect(),
+        environments: [(
+            LOCAL_ENVIRONMENT_ID.to_string(),
+            available("file:///repo", "zsh")?,
+        )]
+        .into_iter()
+        .collect(),
         ..Default::default()
     };
     let mut previous = WorldState::default();
@@ -165,17 +169,23 @@ fn persisted_turn_context_values_render_a_diff() -> Result<()> {
 }
 
 #[test]
-fn single_environment_diff_ignores_id_and_shell() -> Result<()> {
+fn single_environment_diff_ignores_shell() -> Result<()> {
     let previous = EnvironmentsState {
-        environments: [(String::new(), available("file:///repo", "bash")?)]
-            .into_iter()
-            .collect(),
+        environments: [(
+            LOCAL_ENVIRONMENT_ID.to_string(),
+            available("file:///repo", "bash")?,
+        )]
+        .into_iter()
+        .collect(),
         ..Default::default()
     };
     let current = EnvironmentsState {
-        environments: [("local".to_string(), available("file:///repo", "zsh")?)]
-            .into_iter()
-            .collect(),
+        environments: [(
+            LOCAL_ENVIRONMENT_ID.to_string(),
+            available("file:///repo", "zsh")?,
+        )]
+        .into_iter()
+        .collect(),
         ..Default::default()
     };
 
@@ -183,6 +193,31 @@ fn single_environment_diff_ignores_id_and_shell() -> Result<()> {
     Ok(())
 }
 
+#[test]
+fn removed_legacy_environment_renders_unavailable() -> Result<()> {
+    let previous = EnvironmentsState {
+        environments: [(
+            LOCAL_ENVIRONMENT_ID.to_string(),
+            available("file:///repo", "bash")?,
+        )]
+        .into_iter()
+        .collect(),
+        ..Default::default()
+    };
+
+    assert_eq!(
+        Some(user_message(
+            r#"<environment_context>
+  <environments>
+    <environment id="local" status="unavailable" />
+  </environments>
+</environment_context>"#,
+        )),
+        EnvironmentsState::default().render_diff(&previous),
+    );
+    Ok(())
+}
+
 #[test]
 fn loaded_environment_state_produces_no_diff_with_live_state() -> Result<()> {
     let live_state = EnvironmentsState {