diff --git a/codex-rs/app-server-protocol/schema/json/EventMsg.json b/codex-rs/app-server-protocol/schema/json/EventMsg.json
index 61e347bbe9..4788880d9e 100644
--- a/codex-rs/app-server-protocol/schema/json/EventMsg.json
+++ b/codex-rs/app-server-protocol/schema/json/EventMsg.json
@@ -6822,11 +6822,7 @@
       "enum": [
         "prompt",
         "prompt_steering",
-        "prompt_queued",
-        "prompt_with_ide_context",
-        "agents_md_default",
-        "agents_md_custom",
-        "environment_context"
+        "prompt_queued"
       ],
       "type": "string"
     }
diff --git a/codex-rs/app-server-protocol/schema/json/ServerNotification.json b/codex-rs/app-server-protocol/schema/json/ServerNotification.json
index 1d29a0fd63..9868420f98 100644
--- a/codex-rs/app-server-protocol/schema/json/ServerNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/ServerNotification.json
@@ -3368,11 +3368,7 @@
       "enum": [
         "prompt",
         "prompt_steering",
-        "prompt_queued",
-        "prompt_with_ide_context",
-        "agents_md_default",
-        "agents_md_custom",
-        "environment_context"
+        "prompt_queued"
       ],
       "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 f7b8bfbbeb..819078f088 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
@@ -17755,11 +17755,7 @@
         "enum": [
           "prompt",
           "prompt_steering",
-          "prompt_queued",
-          "prompt_with_ide_context",
-          "agents_md_default",
-          "agents_md_custom",
-          "environment_context"
+          "prompt_queued"
         ],
         "type": "string"
       },
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 34f2a4ea8a..2aeaba745d 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
@@ -15800,11 +15800,7 @@
       "enum": [
         "prompt",
         "prompt_steering",
-        "prompt_queued",
-        "prompt_with_ide_context",
-        "agents_md_default",
-        "agents_md_custom",
-        "environment_context"
+        "prompt_queued"
       ],
       "type": "string"
     },
diff --git a/codex-rs/app-server-protocol/schema/json/v2/ItemCompletedNotification.json b/codex-rs/app-server-protocol/schema/json/v2/ItemCompletedNotification.json
index fba7d7bf69..66fd52c528 100644
--- a/codex-rs/app-server-protocol/schema/json/v2/ItemCompletedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ItemCompletedNotification.json
@@ -1256,11 +1256,7 @@
       "enum": [
         "prompt",
         "prompt_steering",
-        "prompt_queued",
-        "prompt_with_ide_context",
-        "agents_md_default",
-        "agents_md_custom",
-        "environment_context"
+        "prompt_queued"
       ],
       "type": "string"
     },
diff --git a/codex-rs/app-server-protocol/schema/json/v2/ItemStartedNotification.json b/codex-rs/app-server-protocol/schema/json/v2/ItemStartedNotification.json
index b9fbdefc49..8b62d11e18 100644
--- a/codex-rs/app-server-protocol/schema/json/v2/ItemStartedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ItemStartedNotification.json
@@ -1256,11 +1256,7 @@
       "enum": [
         "prompt",
         "prompt_steering",
-        "prompt_queued",
-        "prompt_with_ide_context",
-        "agents_md_default",
-        "agents_md_custom",
-        "environment_context"
+        "prompt_queued"
       ],
       "type": "string"
     },
diff --git a/codex-rs/app-server-protocol/schema/json/v2/ReviewStartResponse.json b/codex-rs/app-server-protocol/schema/json/v2/ReviewStartResponse.json
index 0799f0db6e..62ba337558 100644
--- a/codex-rs/app-server-protocol/schema/json/v2/ReviewStartResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ReviewStartResponse.json
@@ -1441,11 +1441,7 @@
       "enum": [
         "prompt",
         "prompt_steering",
-        "prompt_queued",
-        "prompt_with_ide_context",
-        "agents_md_default",
-        "agents_md_custom",
-        "environment_context"
+        "prompt_queued"
       ],
       "type": "string"
     },
diff --git a/codex-rs/app-server-protocol/schema/json/v2/ThreadForkResponse.json b/codex-rs/app-server-protocol/schema/json/v2/ThreadForkResponse.json
index cfc24243da..b422c6e52a 100644
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadForkResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadForkResponse.json
@@ -2000,11 +2000,7 @@
       "enum": [
         "prompt",
         "prompt_steering",
-        "prompt_queued",
-        "prompt_with_ide_context",
-        "agents_md_default",
-        "agents_md_custom",
-        "environment_context"
+        "prompt_queued"
       ],
       "type": "string"
     },
diff --git a/codex-rs/app-server-protocol/schema/json/v2/ThreadListResponse.json b/codex-rs/app-server-protocol/schema/json/v2/ThreadListResponse.json
index 0df1f1cc74..b68b46aad0 100644
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadListResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadListResponse.json
@@ -1754,11 +1754,7 @@
       "enum": [
         "prompt",
         "prompt_steering",
-        "prompt_queued",
-        "prompt_with_ide_context",
-        "agents_md_default",
-        "agents_md_custom",
-        "environment_context"
+        "prompt_queued"
       ],
       "type": "string"
     },
diff --git a/codex-rs/app-server-protocol/schema/json/v2/ThreadMetadataUpdateResponse.json b/codex-rs/app-server-protocol/schema/json/v2/ThreadMetadataUpdateResponse.json
index 9bf99b1d86..8ad8989d0c 100644
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadMetadataUpdateResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadMetadataUpdateResponse.json
@@ -1754,11 +1754,7 @@
       "enum": [
         "prompt",
         "prompt_steering",
-        "prompt_queued",
-        "prompt_with_ide_context",
-        "agents_md_default",
-        "agents_md_custom",
-        "environment_context"
+        "prompt_queued"
       ],
       "type": "string"
     },
diff --git a/codex-rs/app-server-protocol/schema/json/v2/ThreadReadResponse.json b/codex-rs/app-server-protocol/schema/json/v2/ThreadReadResponse.json
index 5771ff1b89..bb80ffcc4d 100644
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadReadResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadReadResponse.json
@@ -1754,11 +1754,7 @@
       "enum": [
         "prompt",
         "prompt_steering",
-        "prompt_queued",
-        "prompt_with_ide_context",
-        "agents_md_default",
-        "agents_md_custom",
-        "environment_context"
+        "prompt_queued"
       ],
       "type": "string"
     },
diff --git a/codex-rs/app-server-protocol/schema/json/v2/ThreadResumeResponse.json b/codex-rs/app-server-protocol/schema/json/v2/ThreadResumeResponse.json
index cbe3c7e5e6..e0027cb262 100644
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadResumeResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadResumeResponse.json
@@ -2000,11 +2000,7 @@
       "enum": [
         "prompt",
         "prompt_steering",
-        "prompt_queued",
-        "prompt_with_ide_context",
-        "agents_md_default",
-        "agents_md_custom",
-        "environment_context"
+        "prompt_queued"
       ],
       "type": "string"
     },
diff --git a/codex-rs/app-server-protocol/schema/json/v2/ThreadRollbackResponse.json b/codex-rs/app-server-protocol/schema/json/v2/ThreadRollbackResponse.json
index edf3ec5528..7798b0c496 100644
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadRollbackResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadRollbackResponse.json
@@ -1754,11 +1754,7 @@
       "enum": [
         "prompt",
         "prompt_steering",
-        "prompt_queued",
-        "prompt_with_ide_context",
-        "agents_md_default",
-        "agents_md_custom",
-        "environment_context"
+        "prompt_queued"
       ],
       "type": "string"
     },
diff --git a/codex-rs/app-server-protocol/schema/json/v2/ThreadStartResponse.json b/codex-rs/app-server-protocol/schema/json/v2/ThreadStartResponse.json
index 1249c5af39..f2b3ecde1d 100644
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadStartResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadStartResponse.json
@@ -2000,11 +2000,7 @@
       "enum": [
         "prompt",
         "prompt_steering",
-        "prompt_queued",
-        "prompt_with_ide_context",
-        "agents_md_default",
-        "agents_md_custom",
-        "environment_context"
+        "prompt_queued"
       ],
       "type": "string"
     },
diff --git a/codex-rs/app-server-protocol/schema/json/v2/ThreadStartedNotification.json b/codex-rs/app-server-protocol/schema/json/v2/ThreadStartedNotification.json
index 1ec4669fda..155d8acc47 100644
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadStartedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadStartedNotification.json
@@ -1754,11 +1754,7 @@
       "enum": [
         "prompt",
         "prompt_steering",
-        "prompt_queued",
-        "prompt_with_ide_context",
-        "agents_md_default",
-        "agents_md_custom",
-        "environment_context"
+        "prompt_queued"
       ],
       "type": "string"
     },
diff --git a/codex-rs/app-server-protocol/schema/json/v2/ThreadUnarchiveResponse.json b/codex-rs/app-server-protocol/schema/json/v2/ThreadUnarchiveResponse.json
index d3260de04d..62d4939330 100644
--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadUnarchiveResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadUnarchiveResponse.json
@@ -1754,11 +1754,7 @@
       "enum": [
         "prompt",
         "prompt_steering",
-        "prompt_queued",
-        "prompt_with_ide_context",
-        "agents_md_default",
-        "agents_md_custom",
-        "environment_context"
+        "prompt_queued"
       ],
       "type": "string"
     },
diff --git a/codex-rs/app-server-protocol/schema/json/v2/TurnCompletedNotification.json b/codex-rs/app-server-protocol/schema/json/v2/TurnCompletedNotification.json
index 52544d814e..da830143f7 100644
--- a/codex-rs/app-server-protocol/schema/json/v2/TurnCompletedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/TurnCompletedNotification.json
@@ -1441,11 +1441,7 @@
       "enum": [
         "prompt",
         "prompt_steering",
-        "prompt_queued",
-        "prompt_with_ide_context",
-        "agents_md_default",
-        "agents_md_custom",
-        "environment_context"
+        "prompt_queued"
       ],
       "type": "string"
     },
diff --git a/codex-rs/app-server-protocol/schema/json/v2/TurnStartResponse.json b/codex-rs/app-server-protocol/schema/json/v2/TurnStartResponse.json
index b2aae5223e..5122a03015 100644
--- a/codex-rs/app-server-protocol/schema/json/v2/TurnStartResponse.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/TurnStartResponse.json
@@ -1441,11 +1441,7 @@
       "enum": [
         "prompt",
         "prompt_steering",
-        "prompt_queued",
-        "prompt_with_ide_context",
-        "agents_md_default",
-        "agents_md_custom",
-        "environment_context"
+        "prompt_queued"
       ],
       "type": "string"
     },
diff --git a/codex-rs/app-server-protocol/schema/json/v2/TurnStartedNotification.json b/codex-rs/app-server-protocol/schema/json/v2/TurnStartedNotification.json
index 737e47882c..77c4cd1a96 100644
--- a/codex-rs/app-server-protocol/schema/json/v2/TurnStartedNotification.json
+++ b/codex-rs/app-server-protocol/schema/json/v2/TurnStartedNotification.json
@@ -1441,11 +1441,7 @@
       "enum": [
         "prompt",
         "prompt_steering",
-        "prompt_queued",
-        "prompt_with_ide_context",
-        "agents_md_default",
-        "agents_md_custom",
-        "environment_context"
+        "prompt_queued"
       ],
       "type": "string"
     },
diff --git a/codex-rs/app-server-protocol/schema/typescript/UserMessageType.ts b/codex-rs/app-server-protocol/schema/typescript/UserMessageType.ts
index ad1cac24ea..154c4894bd 100644
--- a/codex-rs/app-server-protocol/schema/typescript/UserMessageType.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/UserMessageType.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 UserMessageType = "prompt" | "prompt_steering" | "prompt_queued" | "prompt_with_ide_context" | "agents_md_default" | "agents_md_custom" | "environment_context";
+export type UserMessageType = "prompt" | "prompt_steering" | "prompt_queued";
diff --git a/codex-rs/app-server-protocol/schema/typescript/v2/UserMessageType.ts b/codex-rs/app-server-protocol/schema/typescript/v2/UserMessageType.ts
index ad1cac24ea..154c4894bd 100644
--- a/codex-rs/app-server-protocol/schema/typescript/v2/UserMessageType.ts
+++ b/codex-rs/app-server-protocol/schema/typescript/v2/UserMessageType.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 UserMessageType = "prompt" | "prompt_steering" | "prompt_queued" | "prompt_with_ide_context" | "agents_md_default" | "agents_md_custom" | "environment_context";
+export type UserMessageType = "prompt" | "prompt_steering" | "prompt_queued";
diff --git a/codex-rs/app-server-protocol/src/protocol/v2.rs b/codex-rs/app-server-protocol/src/protocol/v2.rs
index 1bed6657eb..60c36a2d54 100644
--- a/codex-rs/app-server-protocol/src/protocol/v2.rs
+++ b/codex-rs/app-server-protocol/src/protocol/v2.rs
@@ -3803,10 +3803,6 @@ pub enum UserMessageType {
     Prompt,
     PromptSteering,
     PromptQueued,
-    PromptWithIdeContext,
-    AgentsMdDefault,
-    AgentsMdCustom,
-    EnvironmentContext,
 }
 
 impl From<CoreUserMessageType> for UserMessageType {
@@ -3815,10 +3811,6 @@ impl From<CoreUserMessageType> for UserMessageType {
             CoreUserMessageType::Prompt => UserMessageType::Prompt,
             CoreUserMessageType::PromptSteering => UserMessageType::PromptSteering,
             CoreUserMessageType::PromptQueued => UserMessageType::PromptQueued,
-            CoreUserMessageType::PromptWithIdeContext => UserMessageType::PromptWithIdeContext,
-            CoreUserMessageType::AgentsMdDefault => UserMessageType::AgentsMdDefault,
-            CoreUserMessageType::AgentsMdCustom => UserMessageType::AgentsMdCustom,
-            CoreUserMessageType::EnvironmentContext => UserMessageType::EnvironmentContext,
         }
     }
 }
diff --git a/codex-rs/protocol/src/items.rs b/codex-rs/protocol/src/items.rs
index cf8c28bca2..824d10a148 100644
--- a/codex-rs/protocol/src/items.rs
+++ b/codex-rs/protocol/src/items.rs
@@ -36,10 +36,6 @@ pub enum UserMessageType {
     Prompt,
     PromptSteering,
     PromptQueued,
-    PromptWithIdeContext,
-    AgentsMdDefault,
-    AgentsMdCustom,
-    EnvironmentContext,
 }
 
 #[derive(Debug, Clone, Default, Deserialize, Serialize, TS, JsonSchema, PartialEq, Eq)]