diff --git a/codex-rs/analytics/src/analytics_client_tests.rs b/codex-rs/analytics/src/analytics_client_tests.rs
index acf6dcf429..359309c0fd 100644
--- a/codex-rs/analytics/src/analytics_client_tests.rs
+++ b/codex-rs/analytics/src/analytics_client_tests.rs
@@ -821,7 +821,7 @@ fn thread_initialized_event_serializes_expected_shape() {
             initialization_mode: ThreadInitializationMode::New,
             subagent_source: None,
             parent_thread_id: None,
-            execution_environment: Some(ThreadExecutionEnvironment::Remote),
+            execution_environment: Some(ThreadExecutionEnvironment::Ssh),
             created_at: 1,
         },
     });
@@ -853,7 +853,7 @@ fn thread_initialized_event_serializes_expected_shape() {
                 "initialization_mode": "new",
                 "subagent_source": null,
                 "parent_thread_id": null,
-                "execution_environment": "remote",
+                "execution_environment": "ssh",
                 "created_at": 1
             }
         })
@@ -1755,7 +1755,7 @@ fn turn_event_serializes_expected_shape() {
             initialization_mode: ThreadInitializationMode::New,
             subagent_source: None,
             parent_thread_id: None,
-            execution_environment: Some(ThreadExecutionEnvironment::Remote),
+            execution_environment: Some(ThreadExecutionEnvironment::Ssh),
             model: Some("gpt-5".to_string()),
             model_provider: "openai".to_string(),
             sandbox_policy: Some("read_only"),
@@ -1817,7 +1817,7 @@ fn turn_event_serializes_expected_shape() {
                 "initialization_mode": "new",
                 "subagent_source": null,
                 "parent_thread_id": null,
-                "execution_environment": "remote",
+                "execution_environment": "ssh",
                 "model": "gpt-5",
                 "model_provider": "openai",
                 "sandbox_policy": "read_only",
@@ -2166,7 +2166,7 @@ async fn thread_execution_environment_flows_to_thread_turn_and_steer_events() {
                 request: Box::new(ClientRequest::ThreadStart {
                     request_id: RequestId::Integer(1),
                     params: ThreadStartParams {
-                        execution_environment: Some(ThreadExecutionEnvironment::Remote),
+                        execution_environment: Some(ThreadExecutionEnvironment::Ssh),
                         ..Default::default()
                     },
                 }),
@@ -2189,7 +2189,7 @@ async fn thread_execution_environment_flows_to_thread_turn_and_steer_events() {
     let thread_payload = serde_json::to_value(&out[0]).expect("serialize thread event");
     assert_eq!(
         thread_payload["event_params"]["execution_environment"],
-        json!("remote")
+        json!("ssh")
     );
     out.clear();
 
@@ -2224,7 +2224,7 @@ async fn thread_execution_environment_flows_to_thread_turn_and_steer_events() {
     let resume_payload = serde_json::to_value(&out[0]).expect("serialize resume thread event");
     assert_eq!(
         resume_payload["event_params"]["execution_environment"],
-        json!("remote")
+        json!("ssh")
     );
     out.clear();
 
@@ -2278,7 +2278,7 @@ async fn thread_execution_environment_flows_to_thread_turn_and_steer_events() {
         serde_json::to_value(turn_steer_event).expect("serialize turn steer event");
     assert_eq!(
         turn_steer_payload["event_params"]["execution_environment"],
-        json!("remote")
+        json!("ssh")
     );
 
     let turn_event = out
@@ -2288,7 +2288,7 @@ async fn thread_execution_environment_flows_to_thread_turn_and_steer_events() {
     let turn_payload = serde_json::to_value(turn_event).expect("serialize turn event");
     assert_eq!(
         turn_payload["event_params"]["execution_environment"],
-        json!("remote")
+        json!("ssh")
     );
 }
 
diff --git a/codex-rs/app-server-protocol/schema/json/ClientRequest.json b/codex-rs/app-server-protocol/schema/json/ClientRequest.json
index 2dba847bb2..2e3b5e4706 100644
--- a/codex-rs/app-server-protocol/schema/json/ClientRequest.json
+++ b/codex-rs/app-server-protocol/schema/json/ClientRequest.json
@@ -3298,7 +3298,9 @@
     },
     "ThreadExecutionEnvironment": {
       "enum": [
-        "remote"
+        "local",
+        "ssh",
+        "remote_control"
       ],
       "type": "string"
     },
diff --git a/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.schemas.json b/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.schemas.json
index 2b8800d204..b08b2323e7 100644
--- a/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.schemas.json
+++ b/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.schemas.json
@@ -14566,7 +14566,9 @@
       },
       "ThreadExecutionEnvironment": {
         "enum": [
-          "remote"
+          "local",
+          "ssh",
+          "remote_control"
         ],
         "type": "string"
       },
@@ -17802,4 +17804,4 @@
   },
   "title": "CodexAppServerProtocol",
   "type": "object"
-}
\ No newline at end of file
+}
diff --git a/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.v2.schemas.json b/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.v2.schemas.json
index b39367fcb1..8b1070f0c0 100644
--- a/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.v2.schemas.json
+++ b/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.v2.schemas.json
@@ -12452,7 +12452,9 @@
     },
     "ThreadExecutionEnvironment": {
       "enum": [
-        "remote"
+        "local",
+        "ssh",
+        "remote_control"
       ],
       "type": "string"
     },
@@ -15687,4 +15689,4 @@
   },
   "title": "CodexAppServerProtocolV2",
   "type": "object"
-}
\ No newline at end of file
+}
diff --git a/codex-rs/app-server-protocol/schema/json/v2/ThreadForkParams.json b/codex-rs/app-server-protocol/schema/json/v2/ThreadForkParams.json
index b57349200b..c7d2209201 100644
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadForkParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadForkParams.json
@@ -406,7 +406,9 @@
     },
     "ThreadExecutionEnvironment": {
       "enum": [
-        "remote"
+        "local",
+        "ssh",
+        "remote_control"
       ],
       "type": "string"
     }
diff --git a/codex-rs/app-server-protocol/schema/json/v2/ThreadResumeParams.json b/codex-rs/app-server-protocol/schema/json/v2/ThreadResumeParams.json
index c5dadf4dc8..4f0272853e 100644
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadResumeParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadResumeParams.json
@@ -1264,7 +1264,9 @@
     },
     "ThreadExecutionEnvironment": {
       "enum": [
-        "remote"
+        "local",
+        "ssh",
+        "remote_control"
       ],
       "type": "string"
     }
diff --git a/codex-rs/app-server-protocol/schema/json/v2/ThreadStartParams.json b/codex-rs/app-server-protocol/schema/json/v2/ThreadStartParams.json
index 4dc535dd95..1aead086f0 100644
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadStartParams.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadStartParams.json
@@ -440,7 +440,9 @@
     },
     "ThreadExecutionEnvironment": {
       "enum": [
-        "remote"
+        "local",
+        "ssh",
+        "remote_control"
       ],
       "type": "string"
     },
diff --git a/codex-rs/app-server-protocol/schema/typescript/v2/ThreadExecutionEnvironment.ts b/codex-rs/app-server-protocol/schema/typescript/v2/ThreadExecutionEnvironment.ts
index 42320d4fea..c9f990e1af 100644
--- a/codex-rs/app-server-protocol/schema/typescript/v2/ThreadExecutionEnvironment.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/ThreadExecutionEnvironment.ts
@@ -2,4 +2,4 @@
 
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type ThreadExecutionEnvironment = "remote";
+export type ThreadExecutionEnvironment = "local" | "ssh" | "remote_control";
diff --git a/codex-rs/app-server-protocol/src/protocol/v2.rs b/codex-rs/app-server-protocol/src/protocol/v2.rs
index 3d1dda125c..c5e7bc8312 100644
--- a/codex-rs/app-server-protocol/src/protocol/v2.rs
+++ b/codex-rs/app-server-protocol/src/protocol/v2.rs
@@ -5267,7 +5267,9 @@ pub struct TurnEnvironmentParams {
 #[serde(rename_all = "snake_case")]
 #[ts(rename_all = "snake_case", export_to = "v2/")]
 pub enum ThreadExecutionEnvironment {
-    Remote,
+    Local,
+    Ssh,
+    RemoteControl,
 }
 
 #[derive(