Extract ContextDiscoverable history handling

codex-rs/app-server-protocol/schema/typescript/Compaction.ts

@@ -0,0 +1,5 @@
+// GENERATED CODE! DO NOT MODIFY BY HAND!
+
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type Compaction = { encrypted_content: string, };

codex-rs/app-server-protocol/schema/typescript/CustomToolCall.ts

@@ -0,0 +1,5 @@
+// GENERATED CODE! DO NOT MODIFY BY HAND!
+
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type CustomToolCall = { status?: string, call_id: string, name: string, input: string, };

codex-rs/app-server-protocol/schema/typescript/CustomToolCallOutput.ts

@@ -0,0 +1,5 @@
+// GENERATED CODE! DO NOT MODIFY BY HAND!
+
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type CustomToolCallOutput = { call_id: string, output: string, };

codex-rs/app-server-protocol/schema/typescript/FunctionCall.ts

@@ -0,0 +1,5 @@
+// GENERATED CODE! DO NOT MODIFY BY HAND!
+
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type FunctionCall = { name: string, arguments: string, call_id: string, };

codex-rs/app-server-protocol/schema/typescript/FunctionCallOutput.ts

@@ -0,0 +1,6 @@
+// GENERATED CODE! DO NOT MODIFY BY HAND!
+
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { FunctionCallOutputPayload } from "./FunctionCallOutputPayload";
+
+export type FunctionCallOutput = { call_id: string, output: FunctionCallOutputPayload, };

codex-rs/app-server-protocol/schema/typescript/GhostSnapshot.ts

@@ -0,0 +1,6 @@
+// GENERATED CODE! DO NOT MODIFY BY HAND!
+
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { GhostCommit } from "./GhostCommit";
+
+export type GhostSnapshot = { ghost_commit: GhostCommit, };

codex-rs/app-server-protocol/schema/typescript/LocalShellCall.ts

@@ -0,0 +1,11 @@
+// GENERATED CODE! DO NOT MODIFY BY HAND!
+
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { LocalShellAction } from "./LocalShellAction";
+import type { LocalShellStatus } from "./LocalShellStatus";
+
+export type LocalShellCall = { 
+/**
+ * Set when using the Responses API.
+ */
+call_id: string | null, status: LocalShellStatus, action: LocalShellAction, };

codex-rs/app-server-protocol/schema/typescript/Message.ts

@@ -0,0 +1,7 @@
+// GENERATED CODE! DO NOT MODIFY BY HAND!
+
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { ContentItem } from "./ContentItem";
+import type { MessagePhase } from "./MessagePhase";
+
+export type Message = { role: string, content: Array<ContentItem>, end_turn?: boolean, phase?: MessagePhase, };

codex-rs/app-server-protocol/schema/typescript/Reasoning.ts

@@ -0,0 +1,7 @@
+// GENERATED CODE! DO NOT MODIFY BY HAND!
+
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { ReasoningItemContent } from "./ReasoningItemContent";
+import type { ReasoningItemReasoningSummary } from "./ReasoningItemReasoningSummary";
+
+export type Reasoning = { summary: Array<ReasoningItemReasoningSummary>, content?: Array<ReasoningItemContent>, encrypted_content: string | null, };

codex-rs/app-server-protocol/schema/typescript/ResponseItem.ts

@@ -1,18 +1,15 @@
 // GENERATED CODE! DO NOT MODIFY BY HAND!
 
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { ContentItem } from "./ContentItem";
-import type { FunctionCallOutputPayload } from "./FunctionCallOutputPayload";
-import type { GhostCommit } from "./GhostCommit";
-import type { LocalShellAction } from "./LocalShellAction";
-import type { LocalShellStatus } from "./LocalShellStatus";
-import type { MessagePhase } from "./MessagePhase";
-import type { ReasoningItemContent } from "./ReasoningItemContent";
-import type { ReasoningItemReasoningSummary } from "./ReasoningItemReasoningSummary";
-import type { WebSearchAction } from "./WebSearchAction";
+import type { Compaction } from "./Compaction";
+import type { CustomToolCall } from "./CustomToolCall";
+import type { CustomToolCallOutput } from "./CustomToolCallOutput";
+import type { FunctionCall } from "./FunctionCall";
+import type { FunctionCallOutput } from "./FunctionCallOutput";
+import type { GhostSnapshot } from "./GhostSnapshot";
+import type { LocalShellCall } from "./LocalShellCall";
+import type { Message } from "./Message";
+import type { Reasoning } from "./Reasoning";
+import type { WebSearchCall } from "./WebSearchCall";
 
-export type ResponseItem = { "type": "message", role: string, content: Array<ContentItem>, end_turn?: boolean, phase?: MessagePhase, } | { "type": "reasoning", summary: Array<ReasoningItemReasoningSummary>, content?: Array<ReasoningItemContent>, encrypted_content: string | null, } | { "type": "local_shell_call", 
-/**
- * Set when using the Responses API.
- */
-call_id: string | null, status: LocalShellStatus, action: LocalShellAction, } | { "type": "function_call", name: string, arguments: string, call_id: string, } | { "type": "function_call_output", call_id: string, output: FunctionCallOutputPayload, } | { "type": "custom_tool_call", status?: string, call_id: string, name: string, input: string, } | { "type": "custom_tool_call_output", call_id: string, output: string, } | { "type": "web_search_call", status?: string, action?: WebSearchAction, } | { "type": "ghost_snapshot", ghost_commit: GhostCommit, } | { "type": "compaction", encrypted_content: string, } | { "type": "other" };
+export type ResponseItem = { "type": "message" } & Message | { "type": "reasoning" } & Reasoning | { "type": "local_shell_call" } & LocalShellCall | { "type": "function_call" } & FunctionCall | { "type": "function_call_output" } & FunctionCallOutput | { "type": "custom_tool_call" } & CustomToolCall | { "type": "custom_tool_call_output" } & CustomToolCallOutput | { "type": "web_search_call" } & WebSearchCall | { "type": "ghost_snapshot" } & GhostSnapshot | { "type": "compaction" } & Compaction | { "type": "other" };

codex-rs/app-server-protocol/schema/typescript/WebSearchCall.ts

@@ -0,0 +1,6 @@
+// GENERATED CODE! DO NOT MODIFY BY HAND!
+
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { WebSearchAction } from "./WebSearchAction";
+
+export type WebSearchCall = { status?: string, action?: WebSearchAction, };

codex-rs/app-server-protocol/schema/typescript/index.ts

@@ -43,6 +43,7 @@ export type { CollabWaitingBeginEvent } from "./CollabWaitingBeginEvent";
 export type { CollabWaitingEndEvent } from "./CollabWaitingEndEvent";
 export type { CollaborationMode } from "./CollaborationMode";
 export type { CollaborationModeMask } from "./CollaborationModeMask";
+export type { Compaction } from "./Compaction";
 export type { ContentItem } from "./ContentItem";
 export type { ContextCompactedEvent } from "./ContextCompactedEvent";
 export type { ContextCompactionItem } from "./ContextCompactionItem";
@@ -50,6 +51,8 @@ export type { ConversationGitInfo } from "./ConversationGitInfo";
 export type { ConversationSummary } from "./ConversationSummary";
 export type { CreditsSnapshot } from "./CreditsSnapshot";
 export type { CustomPrompt } from "./CustomPrompt";
+export type { CustomToolCall } from "./CustomToolCall";
+export type { CustomToolCallOutput } from "./CustomToolCallOutput";
 export type { DeprecationNoticeEvent } from "./DeprecationNoticeEvent";
 export type { DynamicToolCallRequest } from "./DynamicToolCallRequest";
 export type { ElicitationRequestEvent } from "./ElicitationRequestEvent";
@@ -71,6 +74,8 @@ export type { FileChange } from "./FileChange";
 export type { ForcedLoginMethod } from "./ForcedLoginMethod";
 export type { ForkConversationParams } from "./ForkConversationParams";
 export type { ForkConversationResponse } from "./ForkConversationResponse";
+export type { FunctionCall } from "./FunctionCall";
+export type { FunctionCallOutput } from "./FunctionCallOutput";
 export type { FunctionCallOutputBody } from "./FunctionCallOutputBody";
 export type { FunctionCallOutputContentItem } from "./FunctionCallOutputContentItem";
 export type { FunctionCallOutputPayload } from "./FunctionCallOutputPayload";
@@ -85,6 +90,7 @@ export type { GetHistoryEntryResponseEvent } from "./GetHistoryEntryResponseEven
 export type { GetUserAgentResponse } from "./GetUserAgentResponse";
 export type { GetUserSavedConfigResponse } from "./GetUserSavedConfigResponse";
 export type { GhostCommit } from "./GhostCommit";
+export type { GhostSnapshot } from "./GhostSnapshot";
 export type { GitDiffToRemoteParams } from "./GitDiffToRemoteParams";
 export type { GitDiffToRemoteResponse } from "./GitDiffToRemoteResponse";
 export type { GitSha } from "./GitSha";
@@ -104,6 +110,7 @@ export type { ListCustomPromptsResponseEvent } from "./ListCustomPromptsResponse
 export type { ListRemoteSkillsResponseEvent } from "./ListRemoteSkillsResponseEvent";
 export type { ListSkillsResponseEvent } from "./ListSkillsResponseEvent";
 export type { LocalShellAction } from "./LocalShellAction";
+export type { LocalShellCall } from "./LocalShellCall";
 export type { LocalShellExecAction } from "./LocalShellExecAction";
 export type { LocalShellStatus } from "./LocalShellStatus";
 export type { LoginApiKeyParams } from "./LoginApiKeyParams";
@@ -120,6 +127,7 @@ export type { McpStartupStatus } from "./McpStartupStatus";
 export type { McpStartupUpdateEvent } from "./McpStartupUpdateEvent";
 export type { McpToolCallBeginEvent } from "./McpToolCallBeginEvent";
 export type { McpToolCallEndEvent } from "./McpToolCallEndEvent";
+export type { Message } from "./Message";
 export type { MessagePhase } from "./MessagePhase";
 export type { ModeKind } from "./ModeKind";
 export type { NetworkAccess } from "./NetworkAccess";
@@ -137,6 +145,7 @@ export type { Profile } from "./Profile";
 export type { RateLimitSnapshot } from "./RateLimitSnapshot";
 export type { RateLimitWindow } from "./RateLimitWindow";
 export type { RawResponseItemEvent } from "./RawResponseItemEvent";
+export type { Reasoning } from "./Reasoning";
 export type { ReasoningContentDeltaEvent } from "./ReasoningContentDeltaEvent";
 export type { ReasoningEffort } from "./ReasoningEffort";
 export type { ReasoningItem } from "./ReasoningItem";
@@ -218,6 +227,7 @@ export type { ViewImageToolCallEvent } from "./ViewImageToolCallEvent";
 export type { WarningEvent } from "./WarningEvent";
 export type { WebSearchAction } from "./WebSearchAction";
 export type { WebSearchBeginEvent } from "./WebSearchBeginEvent";
+export type { WebSearchCall } from "./WebSearchCall";
 export type { WebSearchEndEvent } from "./WebSearchEndEvent";
 export type { WebSearchItem } from "./WebSearchItem";
 export type { WebSearchMode } from "./WebSearchMode";

codex-rs/app-server/tests/suite/list_resume.rs

@@ -301,7 +301,7 @@ async fn test_list_and_resume_conversations() -> Result<()> {
 
     // Resuming with explicit history should succeed even without a stored rollout.
     let fork_history_text = "Hello from history";
-    let history = vec![ResponseItem::Message {
+    let history = vec![ResponseItem::Message(codex_protocol::models::Message {
         id: None,
         role: "user".to_string(),
         content: vec![ContentItem::InputText {
@@ -309,7 +309,7 @@ async fn test_list_and_resume_conversations() -> Result<()> {
         }],
         end_turn: None,
         phase: None,
-    }];
+    })];
     let resume_with_history_req_id = mcp
         .send_resume_conversation_request(ResumeConversationParams {
             path: None,

codex-rs/app-server/tests/suite/send_message.rs

@@ -445,7 +445,10 @@ async fn read_raw_response_item(mcp: &mut McpProcess, conversation_id: ThreadId)
         // Ghost snapshots are produced concurrently and may arrive before the model reply.
         let event: RawResponseItemEvent =
             serde_json::from_value(msg_value).expect("deserialize raw response item");
-        if !matches!(event.item, ResponseItem::GhostSnapshot { .. }) {
+        if !matches!(
+            event.item,
+            ResponseItem::GhostSnapshot(codex_protocol::models::GhostSnapshot { .. })
+        ) {
             return event.item;
         }
     }
@@ -453,7 +456,7 @@ async fn read_raw_response_item(mcp: &mut McpProcess, conversation_id: ThreadId)
 
 fn assert_instructions_message(item: &ResponseItem) {
     match item {
-        ResponseItem::Message { role, content, .. } => {
+        ResponseItem::Message(codex_protocol::models::Message { role, content, .. }) => {
             assert_eq!(role, "user");
             let texts = content_texts(content);
             let is_instructions = texts
@@ -470,7 +473,7 @@ fn assert_instructions_message(item: &ResponseItem) {
 
 fn assert_permissions_message(item: &ResponseItem) {
     match item {
-        ResponseItem::Message { role, content, .. } => {
+        ResponseItem::Message(codex_protocol::models::Message { role, content, .. }) => {
             assert_eq!(role, "developer");
             let texts = content_texts(content);
             let expected = DeveloperInstructions::from_policy(
@@ -493,7 +496,7 @@ fn assert_permissions_message(item: &ResponseItem) {
 
 fn assert_developer_message(item: &ResponseItem, expected_text: &str) {
     match item {
-        ResponseItem::Message { role, content, .. } => {
+        ResponseItem::Message(codex_protocol::models::Message { role, content, .. }) => {
             assert_eq!(role, "developer");
             let texts = content_texts(content);
             assert_eq!(
@@ -508,7 +511,7 @@ fn assert_developer_message(item: &ResponseItem, expected_text: &str) {
 
 fn assert_environment_message(item: &ResponseItem) {
     match item {
-        ResponseItem::Message { role, content, .. } => {
+        ResponseItem::Message(codex_protocol::models::Message { role, content, .. }) => {
             assert_eq!(role, "user");
             let texts = content_texts(content);
             assert!(
@@ -524,7 +527,7 @@ fn assert_environment_message(item: &ResponseItem) {
 
 fn assert_user_message(item: &ResponseItem, expected_text: &str) {
     match item {
-        ResponseItem::Message { role, content, .. } => {
+        ResponseItem::Message(codex_protocol::models::Message { role, content, .. }) => {
             assert_eq!(role, "user");
             let texts = content_texts(content);
             assert_eq!(texts, vec![expected_text]);
@@ -535,7 +538,7 @@ fn assert_user_message(item: &ResponseItem, expected_text: &str) {
 
 fn assert_assistant_message(item: &ResponseItem, expected_text: &str) {
     match item {
-        ResponseItem::Message { role, content, .. } => {
+        ResponseItem::Message(codex_protocol::models::Message { role, content, .. }) => {
             assert_eq!(role, "assistant");
             let texts = content_texts(content);
             assert_eq!(texts, vec![expected_text]);

codex-rs/app-server/tests/suite/v2/compaction.rs

@@ -123,7 +123,7 @@ async fn auto_compaction_remote_emits_started_and_completed_items() -> Result<()
     let responses_log = responses::mount_sse_sequence(&server, vec![sse1, sse2, sse3]).await;
 
     let compacted_history = vec![
-        ResponseItem::Message {
+        ResponseItem::Message(codex_protocol::models::Message {
             id: None,
             role: "assistant".to_string(),
             content: vec![ContentItem::OutputText {
@@ -131,10 +131,10 @@ async fn auto_compaction_remote_emits_started_and_completed_items() -> Result<()
             }],
             end_turn: None,
             phase: None,
-        },
-        ResponseItem::Compaction {
+        }),
+        ResponseItem::Compaction(codex_protocol::models::Compaction {
             encrypted_content: "ENCRYPTED_COMPACTION_SUMMARY".to_string(),
-        },
+        }),
     ];
     let compact_mock = responses::mount_compact_json_once(
         &server,

codex-rs/app-server/tests/suite/v2/thread_resume.rs

@@ -392,7 +392,7 @@ async fn thread_resume_supports_history_and_overrides() -> Result<()> {
     let ThreadStartResponse { thread, .. } = to_response::<ThreadStartResponse>(start_resp)?;
 
     let history_text = "Hello from history";
-    let history = vec![ResponseItem::Message {
+    let history = vec![ResponseItem::Message(codex_protocol::models::Message {
         id: None,
         role: "user".to_string(),
         content: vec![ContentItem::InputText {
@@ -400,7 +400,7 @@ async fn thread_resume_supports_history_and_overrides() -> Result<()> {
         }],
         end_turn: None,
         phase: None,
-    }];
+    })];
 
     // Resume with explicit history and override the model.
     let resume_id = mcp

codex-rs/codex-api/src/endpoint/aggregate.rs

@@ -36,12 +36,15 @@ impl Stream for AggregatedStream {
                 Poll::Ready(Some(Ok(ResponseEvent::OutputItemDone(item)))) => {
                     let is_assistant_message = matches!(
                         &item,
-                        ResponseItem::Message { role, .. } if role == "assistant"
+                        ResponseItem::Message(codex_protocol::models::Message { role, .. }) if role == "assistant"
                     );
 
                     if is_assistant_message {
                         if this.cumulative.is_empty()
-                            && let ResponseItem::Message { content, .. } = &item
+                            && let ResponseItem::Message(codex_protocol::models::Message {
+                                content,
+                                ..
+                            }) = &item
                             && let Some(text) = content.iter().find_map(|c| match c {
                                 ContentItem::OutputText { text } => Some(text),
                                 _ => None,
@@ -70,29 +73,31 @@ impl Stream for AggregatedStream {
                     let mut emitted_any = false;
 
                     if !this.cumulative_reasoning.is_empty() {
-                        let aggregated_reasoning = ResponseItem::Reasoning {
-                            id: String::new(),
-                            summary: Vec::new(),
-                            content: Some(vec![ReasoningItemContent::ReasoningText {
-                                text: std::mem::take(&mut this.cumulative_reasoning),
-                            }]),
-                            encrypted_content: None,
-                        };
+                        let aggregated_reasoning =
+                            ResponseItem::Reasoning(codex_protocol::models::Reasoning {
+                                id: String::new(),
+                                summary: Vec::new(),
+                                content: Some(vec![ReasoningItemContent::ReasoningText {
+                                    text: std::mem::take(&mut this.cumulative_reasoning),
+                                }]),
+                                encrypted_content: None,
+                            });
                         this.pending
                             .push_back(ResponseEvent::OutputItemDone(aggregated_reasoning));
                         emitted_any = true;
                     }
 
                     if !this.cumulative.is_empty() {
-                        let aggregated_message = ResponseItem::Message {
-                            id: None,
-                            role: "assistant".to_string(),
-                            content: vec![ContentItem::OutputText {
-                                text: std::mem::take(&mut this.cumulative),
-                            }],
-                            end_turn: None,
-                            phase: None,
-                        };
+                        let aggregated_message =
+                            ResponseItem::Message(codex_protocol::models::Message {
+                                id: None,
+                                role: "assistant".to_string(),
+                                content: vec![ContentItem::OutputText {
+                                    text: std::mem::take(&mut this.cumulative),
+                                }],
+                                end_turn: None,
+                                phase: None,
+                            });
                         this.pending
                             .push_back(ResponseEvent::OutputItemDone(aggregated_message));
                         emitted_any = true;

codex-rs/codex-api/src/requests/responses.rs

@@ -169,12 +169,24 @@ fn attach_item_ids(payload_json: &mut Value, original_items: &[ResponseItem]) {
     };
 
     for (value, item) in items.iter_mut().zip(original_items.iter()) {
-        if let ResponseItem::Reasoning { id, .. }
-        | ResponseItem::Message { id: Some(id), .. }
-        | ResponseItem::WebSearchCall { id: Some(id), .. }
-        | ResponseItem::FunctionCall { id: Some(id), .. }
-        | ResponseItem::LocalShellCall { id: Some(id), .. }
-        | ResponseItem::CustomToolCall { id: Some(id), .. } = item
+        if let ResponseItem::Reasoning(codex_protocol::models::Reasoning { id, .. })
+        | ResponseItem::Message(codex_protocol::models::Message { id: Some(id), .. })
+        | ResponseItem::WebSearchCall(codex_protocol::models::WebSearchCall {
+            id: Some(id),
+            ..
+        })
+        | ResponseItem::FunctionCall(codex_protocol::models::FunctionCall {
+            id: Some(id),
+            ..
+        })
+        | ResponseItem::LocalShellCall(codex_protocol::models::LocalShellCall {
+            id: Some(id),
+            ..
+        })
+        | ResponseItem::CustomToolCall(codex_protocol::models::CustomToolCall {
+            id: Some(id),
+            ..
+        }) = item
         {
             if id.is_empty() {
                 continue;
@@ -217,20 +229,20 @@ mod tests {
     fn azure_default_store_attaches_ids_and_headers() {
         let provider = provider("azure", "https://example.openai.azure.com/v1");
         let input = vec![
-            ResponseItem::Message {
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: Some("m1".into()),
                 role: "assistant".into(),
                 content: Vec::new(),
                 end_turn: None,
                 phase: None,
-            },
-            ResponseItem::Message {
+            }),
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "assistant".into(),
                 content: Vec::new(),
                 end_turn: None,
                 phase: None,
-            },
+            }),
         ];
 
         let request = ResponsesRequestBuilder::new("gpt-test", "inst", &input)

codex-rs/codex-api/src/sse/responses.rs

@@ -531,16 +531,16 @@ mod tests {
 
         assert_matches!(
             &events[0],
-            Ok(ResponseEvent::OutputItemDone(ResponseItem::Message {
+            Ok(ResponseEvent::OutputItemDone(ResponseItem::Message(codex_protocol::models::Message {
                 role,
                 phase: Some(MessagePhase::Commentary),
                 ..
-            })) if role == "assistant"
+            }))) if role == "assistant"
         );
 
         assert_matches!(
             &events[1],
-            Ok(ResponseEvent::OutputItemDone(ResponseItem::Message { role, .. }))
+            Ok(ResponseEvent::OutputItemDone(ResponseItem::Message(codex_protocol::models::Message { role, .. })))
                 if role == "assistant"
         );
 

codex-rs/codex-api/tests/clients.rs

@@ -255,7 +255,7 @@ async fn streaming_client_retries_on_transport_error() -> Result<()> {
 
     let prompt = codex_api::Prompt {
         instructions: "Say hi".to_string(),
-        input: vec![ResponseItem::Message {
+        input: vec![ResponseItem::Message(codex_protocol::models::Message {
             id: None,
             role: "user".to_string(),
             content: vec![ContentItem::InputText {
@@ -263,7 +263,7 @@ async fn streaming_client_retries_on_transport_error() -> Result<()> {
             }],
             end_turn: None,
             phase: None,
-        }],
+        })],
         tools: Vec::<Value>::new(),
         parallel_tool_calls: false,
         output_schema: None,

codex-rs/codex-api/tests/sse_end_to_end.rs

@@ -144,14 +144,20 @@ async fn responses_stream_parses_items_and_completed_end_to_end() -> Result<()>
     assert_eq!(events.len(), 3);
 
     match &events[0] {
-        ResponseEvent::OutputItemDone(ResponseItem::Message { role, .. }) => {
+        ResponseEvent::OutputItemDone(ResponseItem::Message(codex_protocol::models::Message {
+            role,
+            ..
+        })) => {
             assert_eq!(role, "assistant");
         }
         other => panic!("unexpected first event: {other:?}"),
     }
 
     match &events[1] {
-        ResponseEvent::OutputItemDone(ResponseItem::Message { role, .. }) => {
+        ResponseEvent::OutputItemDone(ResponseItem::Message(codex_protocol::models::Message {
+            role,
+            ..
+        })) => {
             assert_eq!(role, "assistant");
         }
         other => panic!("unexpected second event: {other:?}"),
@@ -215,7 +221,10 @@ async fn responses_stream_aggregates_output_text_deltas() -> Result<()> {
     assert_eq!(events.len(), 2);
 
     match &events[0] {
-        ResponseEvent::OutputItemDone(ResponseItem::Message { content, .. }) => {
+        ResponseEvent::OutputItemDone(ResponseItem::Message(codex_protocol::models::Message {
+            content,
+            ..
+        })) => {
             let mut aggregated = String::new();
             for item in content {
                 if let ContentItem::OutputText { text } = item {

codex-rs/core/src/client_common.rs

@@ -68,35 +68,45 @@ fn reserialize_shell_outputs(items: &mut [ResponseItem]) {
     let mut shell_call_ids: HashSet<String> = HashSet::new();
 
     items.iter_mut().for_each(|item| match item {
-        ResponseItem::LocalShellCall { call_id, id, .. } => {
+        ResponseItem::LocalShellCall(codex_protocol::models::LocalShellCall {
+            call_id,
+            id,
+            ..
+        }) => {
             if let Some(identifier) = call_id.clone().or_else(|| id.clone()) {
                 shell_call_ids.insert(identifier);
             }
         }
-        ResponseItem::CustomToolCall {
+        ResponseItem::CustomToolCall(codex_protocol::models::CustomToolCall {
             id: _,
             status: _,
             call_id,
             name,
             input: _,
-        } => {
+        }) => {
             if name == "apply_patch" {
                 shell_call_ids.insert(call_id.clone());
             }
         }
-        ResponseItem::CustomToolCallOutput { call_id, output } => {
+        ResponseItem::CustomToolCallOutput(codex_protocol::models::CustomToolCallOutput {
+            call_id,
+            output,
+        }) => {
             if shell_call_ids.remove(call_id)
                 && let Some(structured) = parse_structured_shell_output(output)
             {
                 *output = structured
             }
         }
-        ResponseItem::FunctionCall { name, call_id, .. }
-            if is_shell_tool_name(name) || name == "apply_patch" =>
-        {
+        ResponseItem::FunctionCall(codex_protocol::models::FunctionCall {
+            name, call_id, ..
+        }) if is_shell_tool_name(name) || name == "apply_patch" => {
             shell_call_ids.insert(call_id.clone());
         }
-        ResponseItem::FunctionCallOutput { call_id, output } => {
+        ResponseItem::FunctionCallOutput(codex_protocol::models::FunctionCallOutput {
+            call_id,
+            output,
+        }) => {
             if shell_call_ids.remove(call_id)
                 && let Some(structured) = output
                     .text_content()

codex-rs/core/src/codex.rs

@@ -2083,7 +2083,7 @@ impl Session {
         self.services
             .otel_manager
             .counter("codex.model_warning", 1, &[]);
-        let item = ResponseItem::Message {
+        let item = ResponseItem::Message(codex_protocol::models::Message {
             id: None,
             role: "user".to_string(),
             content: vec![ContentItem::InputText {
@@ -2091,7 +2091,7 @@ impl Session {
             }],
             end_turn: None,
             phase: None,
-        };
+        });
 
         self.record_conversation_items(ctx, &[item]).await;
     }
@@ -4475,7 +4475,7 @@ async fn maybe_complete_plan_item_from_message(
     state: &mut PlanModeStreamState,
     item: &ResponseItem,
 ) {
-    if let ResponseItem::Message { role, content, .. } = item
+    if let ResponseItem::Message(codex_protocol::models::Message { role, content, .. }) = item
         && role == "assistant"
     {
         let mut text = String::new();
@@ -4568,7 +4568,7 @@ async fn handle_assistant_item_done_in_plan_mode(
     previously_active_item: Option<&TurnItem>,
     last_agent_message: &mut Option<String>,
 ) -> bool {
-    if let ResponseItem::Message { role, .. } = item
+    if let ResponseItem::Message(codex_protocol::models::Message { role, .. }) = item
         && role == "assistant"
     {
         maybe_complete_plan_item_from_message(sess, turn_context, state, item).await;
@@ -4912,7 +4912,7 @@ async fn try_run_sampling_request(
 
 pub(super) fn get_last_assistant_message_from_turn(responses: &[ResponseItem]) -> Option<String> {
     responses.iter().rev().find_map(|item| {
-        if let ResponseItem::Message { role, content, .. } = item {
+        if let ResponseItem::Message(codex_protocol::models::Message { role, content, .. }) = item {
             if role == "assistant" {
                 content.iter().rev().find_map(|ci| {
                     if let ContentItem::OutputText { text } = ci {
@@ -4994,7 +4994,7 @@ mod tests {
     }
 
     fn user_message(text: &str) -> ResponseItem {
-        ResponseItem::Message {
+        ResponseItem::Message(codex_protocol::models::Message {
             id: None,
             role: "user".to_string(),
             content: vec![ContentItem::InputText {
@@ -5002,7 +5002,7 @@ mod tests {
             }],
             end_turn: None,
             phase: None,
-        }
+        })
     }
 
     fn make_connector(id: &str, name: &str) -> AppInfo {
@@ -5136,7 +5136,7 @@ mod tests {
     #[tokio::test]
     async fn reconstruct_history_uses_replacement_history_verbatim() {
         let (session, turn_context) = make_session_and_context().await;
-        let summary_item = ResponseItem::Message {
+        let summary_item = ResponseItem::Message(codex_protocol::models::Message {
             id: None,
             role: "user".to_string(),
             content: vec![ContentItem::InputText {
@@ -5144,10 +5144,10 @@ mod tests {
             }],
             end_turn: None,
             phase: None,
-        };
+        });
         let replacement_history = vec![
             summary_item.clone(),
-            ResponseItem::Message {
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "developer".to_string(),
                 content: vec![ContentItem::InputText {
@@ -5155,7 +5155,7 @@ mod tests {
                 }],
                 end_turn: None,
                 phase: None,
-            },
+            }),
         ];
         let rollout_items = vec![RolloutItem::Compacted(CompactedItem {
             message: String::new(),
@@ -5352,7 +5352,7 @@ mod tests {
             .await;
 
         let turn_1 = vec![
-            ResponseItem::Message {
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "user".to_string(),
                 content: vec![ContentItem::InputText {
@@ -5360,8 +5360,8 @@ mod tests {
                 }],
                 end_turn: None,
                 phase: None,
-            },
-            ResponseItem::Message {
+            }),
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "assistant".to_string(),
                 content: vec![ContentItem::OutputText {
@@ -5369,12 +5369,12 @@ mod tests {
                 }],
                 end_turn: None,
                 phase: None,
-            },
+            }),
         ];
         sess.record_into_history(&turn_1, tc.as_ref()).await;
 
         let turn_2 = vec![
-            ResponseItem::Message {
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "user".to_string(),
                 content: vec![ContentItem::InputText {
@@ -5382,8 +5382,8 @@ mod tests {
                 }],
                 end_turn: None,
                 phase: None,
-            },
-            ResponseItem::Message {
+            }),
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "assistant".to_string(),
                 content: vec![ContentItem::OutputText {
@@ -5391,7 +5391,7 @@ mod tests {
                 }],
                 end_turn: None,
                 phase: None,
-            },
+            }),
         ];
         sess.record_into_history(&turn_2, tc.as_ref()).await;
 
@@ -5416,7 +5416,7 @@ mod tests {
         sess.record_into_history(&initial_context, tc.as_ref())
             .await;
 
-        let turn_1 = vec![ResponseItem::Message {
+        let turn_1 = vec![ResponseItem::Message(codex_protocol::models::Message {
             id: None,
             role: "user".to_string(),
             content: vec![ContentItem::InputText {
@@ -5424,7 +5424,7 @@ mod tests {
             }],
             end_turn: None,
             phase: None,
-        }];
+        })];
         sess.record_into_history(&turn_1, tc.as_ref()).await;
 
         handlers::thread_rollback(&sess, "sub-1".to_string(), 99).await;
@@ -6144,7 +6144,7 @@ mod tests {
         let last = history_items.last().expect("warning recorded");
 
         match last {
-            ResponseItem::Message { role, content, .. } => {
+            ResponseItem::Message(codex_protocol::models::Message { role, content, .. }) => {
                 assert_eq!(role, "user");
                 assert_eq!(
                     content,
@@ -6282,7 +6282,7 @@ mod tests {
         sess.on_task_finished(Arc::clone(&tc), None).await;
 
         let history = sess.clone_history().await;
-        let expected = ResponseItem::Message {
+        let expected = ResponseItem::Message(codex_protocol::models::Message {
             id: None,
             role: "user".to_string(),
             content: vec![ContentItem::InputText {
@@ -6290,7 +6290,7 @@ mod tests {
             }],
             end_turn: None,
             phase: None,
-        };
+        });
         assert!(
             history.raw_items().iter().any(|item| item == &expected),
             "expected pending input to be persisted into history on turn completion"
@@ -6438,7 +6438,10 @@ mod tests {
         // recorded in history for the model.
         assert!(
             history.raw_items().iter().any(|item| {
-                let ResponseItem::Message { role, content, .. } = item else {
+                let ResponseItem::Message(codex_protocol::models::Message {
+                    role, content, ..
+                }) = item
+                else {
                     return false;
                 };
                 if role != "user" {
@@ -6477,13 +6480,13 @@ mod tests {
             ),
             turn_context.dynamic_tools.as_slice(),
         );
-        let item = ResponseItem::CustomToolCall {
+        let item = ResponseItem::CustomToolCall(codex_protocol::models::CustomToolCall {
             id: None,
             status: None,
             call_id: "call-1".to_string(),
             name: "shell".to_string(),
             input: "{}".to_string(),
-        };
+        });
 
         let call = ToolRouter::build_tool_call(session.as_ref(), item.clone())
             .await
@@ -6521,7 +6524,7 @@ mod tests {
         }
         live_history.record_items(initial_context.iter(), turn_context.truncation_policy);
 
-        let user1 = ResponseItem::Message {
+        let user1 = ResponseItem::Message(codex_protocol::models::Message {
             id: None,
             role: "user".to_string(),
             content: vec![ContentItem::InputText {
@@ -6529,11 +6532,11 @@ mod tests {
             }],
             end_turn: None,
             phase: None,
-        };
+        });
         live_history.record_items(std::iter::once(&user1), turn_context.truncation_policy);
         rollout_items.push(RolloutItem::ResponseItem(user1.clone()));
 
-        let assistant1 = ResponseItem::Message {
+        let assistant1 = ResponseItem::Message(codex_protocol::models::Message {
             id: None,
             role: "assistant".to_string(),
             content: vec![ContentItem::OutputText {
@@ -6541,7 +6544,7 @@ mod tests {
             }],
             end_turn: None,
             phase: None,
-        };
+        });
         live_history.record_items(std::iter::once(&assistant1), turn_context.truncation_policy);
         rollout_items.push(RolloutItem::ResponseItem(assistant1.clone()));
 
@@ -6559,7 +6562,7 @@ mod tests {
             replacement_history: None,
         }));
 
-        let user2 = ResponseItem::Message {
+        let user2 = ResponseItem::Message(codex_protocol::models::Message {
             id: None,
             role: "user".to_string(),
             content: vec![ContentItem::InputText {
@@ -6567,11 +6570,11 @@ mod tests {
             }],
             end_turn: None,
             phase: None,
-        };
+        });
         live_history.record_items(std::iter::once(&user2), turn_context.truncation_policy);
         rollout_items.push(RolloutItem::ResponseItem(user2.clone()));
 
-        let assistant2 = ResponseItem::Message {
+        let assistant2 = ResponseItem::Message(codex_protocol::models::Message {
             id: None,
             role: "assistant".to_string(),
             content: vec![ContentItem::OutputText {
@@ -6579,7 +6582,7 @@ mod tests {
             }],
             end_turn: None,
             phase: None,
-        };
+        });
         live_history.record_items(std::iter::once(&assistant2), turn_context.truncation_policy);
         rollout_items.push(RolloutItem::ResponseItem(assistant2.clone()));
 
@@ -6597,7 +6600,7 @@ mod tests {
             replacement_history: None,
         }));
 
-        let user3 = ResponseItem::Message {
+        let user3 = ResponseItem::Message(codex_protocol::models::Message {
             id: None,
             role: "user".to_string(),
             content: vec![ContentItem::InputText {
@@ -6605,11 +6608,11 @@ mod tests {
             }],
             end_turn: None,
             phase: None,
-        };
+        });
         live_history.record_items(std::iter::once(&user3), turn_context.truncation_policy);
         rollout_items.push(RolloutItem::ResponseItem(user3));
 
-        let assistant3 = ResponseItem::Message {
+        let assistant3 = ResponseItem::Message(codex_protocol::models::Message {
             id: None,
             role: "assistant".to_string(),
             content: vec![ContentItem::OutputText {
@@ -6617,7 +6620,7 @@ mod tests {
             }],
             end_turn: None,
             phase: None,
-        };
+        });
         live_history.record_items(std::iter::once(&assistant3), turn_context.truncation_policy);
         rollout_items.push(RolloutItem::ResponseItem(assistant3));
 

codex-rs/core/src/codex_delegate.rs

@@ -493,13 +493,13 @@ mod tests {
             .send(Event {
                 id: "evt".to_string(),
                 msg: EventMsg::RawResponseItem(RawResponseItemEvent {
-                    item: ResponseItem::CustomToolCall {
+                    item: ResponseItem::CustomToolCall(codex_protocol::models::CustomToolCall {
                         id: None,
                         status: None,
                         call_id: "call-1".to_string(),
                         name: "tool".to_string(),
                         input: "{}".to_string(),
-                    },
+                    }),
                 }),
             })
             .await

codex-rs/core/src/compact.rs

@@ -192,7 +192,12 @@ async fn run_compact_task_inner(
     let mut new_history = build_compacted_history(initial_context, &user_messages, &summary_text);
     let ghost_snapshots: Vec<ResponseItem> = history_items
         .iter()
-        .filter(|item| matches!(item, ResponseItem::GhostSnapshot { .. }))
+        .filter(|item| {
+            matches!(
+                item,
+                ResponseItem::GhostSnapshot(codex_protocol::models::GhostSnapshot { .. })
+            )
+        })
         .cloned()
         .collect();
     new_history.extend(ghost_snapshots);
@@ -293,11 +298,17 @@ pub(crate) fn process_compacted_history(
 /// summary messages because they parse as `TurnItem::UserMessage`.
 fn should_keep_compacted_history_item(item: &ResponseItem) -> bool {
     match item {
-        ResponseItem::Message { role, .. } if role == "developer" => false,
-        ResponseItem::Message { role, .. } if role == "user" => matches!(
-            crate::event_mapping::parse_turn_item(item),
-            Some(TurnItem::UserMessage(_))
-        ),
+        ResponseItem::Message(codex_protocol::models::Message { role, .. })
+            if role == "developer" =>
+        {
+            false
+        }
+        ResponseItem::Message(codex_protocol::models::Message { role, .. }) if role == "user" => {
+            matches!(
+                crate::event_mapping::parse_turn_item(item),
+                Some(TurnItem::UserMessage(_))
+            )
+        }
         _ => true,
     }
 }
@@ -342,7 +353,7 @@ fn build_compacted_history_with_limit(
     }
 
     for message in &selected_messages {
-        history.push(ResponseItem::Message {
+        history.push(ResponseItem::Message(codex_protocol::models::Message {
             id: None,
             role: "user".to_string(),
             content: vec![ContentItem::InputText {
@@ -350,7 +361,7 @@ fn build_compacted_history_with_limit(
             }],
             end_turn: None,
             phase: None,
-        });
+        }));
     }
 
     let summary_text = if summary_text.is_empty() {
@@ -359,13 +370,13 @@ fn build_compacted_history_with_limit(
         summary_text.to_string()
     };
 
-    history.push(ResponseItem::Message {
+    history.push(ResponseItem::Message(codex_protocol::models::Message {
         id: None,
         role: "user".to_string(),
         content: vec![ContentItem::InputText { text: summary_text }],
         end_turn: None,
         phase: None,
-    });
+    }));
 
     history
 }
@@ -456,7 +467,7 @@ mod tests {
     #[test]
     fn collect_user_messages_extracts_user_text_only() {
         let items = vec![
-            ResponseItem::Message {
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: Some("assistant".to_string()),
                 role: "assistant".to_string(),
                 content: vec![ContentItem::OutputText {
@@ -464,8 +475,8 @@ mod tests {
                 }],
                 end_turn: None,
                 phase: None,
-            },
-            ResponseItem::Message {
+            }),
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: Some("user".to_string()),
                 role: "user".to_string(),
                 content: vec![ContentItem::InputText {
@@ -473,7 +484,7 @@ mod tests {
                 }],
                 end_turn: None,
                 phase: None,
-            },
+            }),
             ResponseItem::Other,
         ];
 
@@ -485,7 +496,7 @@ mod tests {
     #[test]
     fn collect_user_messages_filters_session_prefix_entries() {
         let items = vec![
-            ResponseItem::Message {
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "user".to_string(),
                 content: vec![ContentItem::InputText {
@@ -498,8 +509,8 @@ do things
                 }],
                 end_turn: None,
                 phase: None,
-            },
-            ResponseItem::Message {
+            }),
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "user".to_string(),
                 content: vec![ContentItem::InputText {
@@ -507,8 +518,8 @@ do things
                 }],
                 end_turn: None,
                 phase: None,
-            },
-            ResponseItem::Message {
+            }),
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "user".to_string(),
                 content: vec![ContentItem::InputText {
@@ -516,7 +527,7 @@ do things
                 }],
                 end_turn: None,
                 phase: None,
-            },
+            }),
         ];
 
         let collected = collect_user_messages(&items);
@@ -541,12 +552,13 @@ do things
         let truncated_message = &history[0];
         let summary_message = &history[1];
 
-        let truncated_text = match truncated_message {
-            ResponseItem::Message { role, content, .. } if role == "user" => {
-                content_items_to_text(content).unwrap_or_default()
-            }
-            other => panic!("unexpected item in history: {other:?}"),
-        };
+        let truncated_text =
+            match truncated_message {
+                ResponseItem::Message(codex_protocol::models::Message {
+                    role, content, ..
+                }) if role == "user" => content_items_to_text(content).unwrap_or_default(),
+                other => panic!("unexpected item in history: {other:?}"),
+            };
 
         assert!(
             truncated_text.contains("tokens truncated"),
@@ -557,12 +569,13 @@ do things
             "truncated user message should not include the full oversized user text"
         );
 
-        let summary_text = match summary_message {
-            ResponseItem::Message { role, content, .. } if role == "user" => {
-                content_items_to_text(content).unwrap_or_default()
-            }
-            other => panic!("unexpected item in history: {other:?}"),
-        };
+        let summary_text =
+            match summary_message {
+                ResponseItem::Message(codex_protocol::models::Message {
+                    role, content, ..
+                }) if role == "user" => content_items_to_text(content).unwrap_or_default(),
+                other => panic!("unexpected item in history: {other:?}"),
+            };
         assert_eq!(summary_text, "SUMMARY");
     }
 
@@ -579,19 +592,20 @@ do things
         );
 
         let last = history.last().expect("history should have a summary entry");
-        let summary = match last {
-            ResponseItem::Message { role, content, .. } if role == "user" => {
-                content_items_to_text(content).unwrap_or_default()
-            }
-            other => panic!("expected summary message, found {other:?}"),
-        };
+        let summary =
+            match last {
+                ResponseItem::Message(codex_protocol::models::Message {
+                    role, content, ..
+                }) if role == "user" => content_items_to_text(content).unwrap_or_default(),
+                other => panic!("expected summary message, found {other:?}"),
+            };
         assert_eq!(summary, summary_text);
     }
 
     #[test]
     fn process_compacted_history_replaces_developer_messages() {
         let compacted_history = vec![
-            ResponseItem::Message {
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "developer".to_string(),
                 content: vec![ContentItem::InputText {
@@ -599,8 +613,8 @@ do things
                 }],
                 end_turn: None,
                 phase: None,
-            },
-            ResponseItem::Message {
+            }),
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "user".to_string(),
                 content: vec![ContentItem::InputText {
@@ -608,8 +622,8 @@ do things
                 }],
                 end_turn: None,
                 phase: None,
-            },
-            ResponseItem::Message {
+            }),
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "developer".to_string(),
                 content: vec![ContentItem::InputText {
@@ -617,10 +631,10 @@ do things
                 }],
                 end_turn: None,
                 phase: None,
-            },
+            }),
         ];
         let initial_context = vec![
-            ResponseItem::Message {
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "developer".to_string(),
                 content: vec![ContentItem::InputText {
@@ -628,8 +642,8 @@ do things
                 }],
                 end_turn: None,
                 phase: None,
-            },
-            ResponseItem::Message {
+            }),
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "user".to_string(),
                 content: vec![ContentItem::InputText {
@@ -641,8 +655,8 @@ do things
                 }],
                 end_turn: None,
                 phase: None,
-            },
-            ResponseItem::Message {
+            }),
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "developer".to_string(),
                 content: vec![ContentItem::InputText {
@@ -650,12 +664,12 @@ do things
                 }],
                 end_turn: None,
                 phase: None,
-            },
+            }),
         ];
 
         let refreshed = process_compacted_history(compacted_history, &initial_context);
         let expected = vec![
-            ResponseItem::Message {
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "developer".to_string(),
                 content: vec![ContentItem::InputText {
@@ -663,8 +677,8 @@ do things
                 }],
                 end_turn: None,
                 phase: None,
-            },
-            ResponseItem::Message {
+            }),
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "user".to_string(),
                 content: vec![ContentItem::InputText {
@@ -676,8 +690,8 @@ do things
                 }],
                 end_turn: None,
                 phase: None,
-            },
-            ResponseItem::Message {
+            }),
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "developer".to_string(),
                 content: vec![ContentItem::InputText {
@@ -685,8 +699,8 @@ do things
                 }],
                 end_turn: None,
                 phase: None,
-            },
-            ResponseItem::Message {
+            }),
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "user".to_string(),
                 content: vec![ContentItem::InputText {
@@ -694,14 +708,14 @@ do things
                 }],
                 end_turn: None,
                 phase: None,
-            },
+            }),
         ];
         assert_eq!(refreshed, expected);
     }
 
     #[test]
     fn process_compacted_history_reinjects_full_initial_context() {
-        let compacted_history = vec![ResponseItem::Message {
+        let compacted_history = vec![ResponseItem::Message(codex_protocol::models::Message {
             id: None,
             role: "user".to_string(),
             content: vec![ContentItem::InputText {
@@ -709,9 +723,9 @@ do things
             }],
             end_turn: None,
             phase: None,
-        }];
+        })];
         let initial_context = vec![
-            ResponseItem::Message {
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "developer".to_string(),
                 content: vec![ContentItem::InputText {
@@ -719,8 +733,8 @@ do things
                 }],
                 end_turn: None,
                 phase: None,
-            },
-            ResponseItem::Message {
+            }),
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "user".to_string(),
                 content: vec![ContentItem::InputText {
@@ -733,8 +747,8 @@ keep me updated
                 }],
                 end_turn: None,
                 phase: None,
-            },
-            ResponseItem::Message {
+            }),
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "user".to_string(),
                 content: vec![ContentItem::InputText {
@@ -746,8 +760,8 @@ keep me updated
                 }],
                 end_turn: None,
                 phase: None,
-            },
-            ResponseItem::Message {
+            }),
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "user".to_string(),
                 content: vec![ContentItem::InputText {
@@ -759,12 +773,12 @@ keep me updated
                 }],
                 end_turn: None,
                 phase: None,
-            },
+            }),
         ];
 
         let refreshed = process_compacted_history(compacted_history, &initial_context);
         let expected = vec![
-            ResponseItem::Message {
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "developer".to_string(),
                 content: vec![ContentItem::InputText {
@@ -772,8 +786,8 @@ keep me updated
                 }],
                 end_turn: None,
                 phase: None,
-            },
-            ResponseItem::Message {
+            }),
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "user".to_string(),
                 content: vec![ContentItem::InputText {
@@ -786,8 +800,8 @@ keep me updated
                 }],
                 end_turn: None,
                 phase: None,
-            },
-            ResponseItem::Message {
+            }),
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "user".to_string(),
                 content: vec![ContentItem::InputText {
@@ -799,8 +813,8 @@ keep me updated
                 }],
                 end_turn: None,
                 phase: None,
-            },
-            ResponseItem::Message {
+            }),
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "user".to_string(),
                 content: vec![ContentItem::InputText {
@@ -812,8 +826,8 @@ keep me updated
                 }],
                 end_turn: None,
                 phase: None,
-            },
-            ResponseItem::Message {
+            }),
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "user".to_string(),
                 content: vec![ContentItem::InputText {
@@ -821,7 +835,7 @@ keep me updated
                 }],
                 end_turn: None,
                 phase: None,
-            },
+            }),
         ];
         assert_eq!(refreshed, expected);
     }
@@ -829,7 +843,7 @@ keep me updated
     #[test]
     fn process_compacted_history_drops_non_user_content_messages() {
         let compacted_history = vec![
-            ResponseItem::Message {
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "user".to_string(),
                 content: vec![ContentItem::InputText {
@@ -842,8 +856,8 @@ keep me updated
                 }],
                 end_turn: None,
                 phase: None,
-            },
-            ResponseItem::Message {
+            }),
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "user".to_string(),
                 content: vec![ContentItem::InputText {
@@ -855,8 +869,8 @@ keep me updated
                 }],
                 end_turn: None,
                 phase: None,
-            },
-            ResponseItem::Message {
+            }),
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "user".to_string(),
                 content: vec![ContentItem::InputText {
@@ -868,8 +882,8 @@ keep me updated
                 }],
                 end_turn: None,
                 phase: None,
-            },
-            ResponseItem::Message {
+            }),
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "user".to_string(),
                 content: vec![ContentItem::InputText {
@@ -877,8 +891,8 @@ keep me updated
                 }],
                 end_turn: None,
                 phase: None,
-            },
-            ResponseItem::Message {
+            }),
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "developer".to_string(),
                 content: vec![ContentItem::InputText {
@@ -886,9 +900,9 @@ keep me updated
                 }],
                 end_turn: None,
                 phase: None,
-            },
+            }),
         ];
-        let initial_context = vec![ResponseItem::Message {
+        let initial_context = vec![ResponseItem::Message(codex_protocol::models::Message {
             id: None,
             role: "developer".to_string(),
             content: vec![ContentItem::InputText {
@@ -896,11 +910,11 @@ keep me updated
             }],
             end_turn: None,
             phase: None,
-        }];
+        })];
 
         let refreshed = process_compacted_history(compacted_history, &initial_context);
         let expected = vec![
-            ResponseItem::Message {
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "developer".to_string(),
                 content: vec![ContentItem::InputText {
@@ -908,8 +922,8 @@ keep me updated
                 }],
                 end_turn: None,
                 phase: None,
-            },
-            ResponseItem::Message {
+            }),
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "user".to_string(),
                 content: vec![ContentItem::InputText {
@@ -917,7 +931,7 @@ keep me updated
                 }],
                 end_turn: None,
                 phase: None,
-            },
+            }),
         ];
         assert_eq!(refreshed, expected);
     }
@@ -925,7 +939,7 @@ keep me updated
     #[test]
     fn process_compacted_history_inserts_context_before_last_real_user_message_only() {
         let compacted_history = vec![
-            ResponseItem::Message {
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "user".to_string(),
                 content: vec![ContentItem::InputText {
@@ -933,8 +947,8 @@ keep me updated
                 }],
                 end_turn: None,
                 phase: None,
-            },
-            ResponseItem::Message {
+            }),
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "user".to_string(),
                 content: vec![ContentItem::InputText {
@@ -942,8 +956,8 @@ keep me updated
                 }],
                 end_turn: None,
                 phase: None,
-            },
-            ResponseItem::Message {
+            }),
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "user".to_string(),
                 content: vec![ContentItem::InputText {
@@ -951,9 +965,9 @@ keep me updated
                 }],
                 end_turn: None,
                 phase: None,
-            },
+            }),
         ];
-        let initial_context = vec![ResponseItem::Message {
+        let initial_context = vec![ResponseItem::Message(codex_protocol::models::Message {
             id: None,
             role: "developer".to_string(),
             content: vec![ContentItem::InputText {
@@ -961,11 +975,11 @@ keep me updated
             }],
             end_turn: None,
             phase: None,
-        }];
+        })];
 
         let refreshed = process_compacted_history(compacted_history, &initial_context);
         let expected = vec![
-            ResponseItem::Message {
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "user".to_string(),
                 content: vec![ContentItem::InputText {
@@ -973,8 +987,8 @@ keep me updated
                 }],
                 end_turn: None,
                 phase: None,
-            },
-            ResponseItem::Message {
+            }),
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "user".to_string(),
                 content: vec![ContentItem::InputText {
@@ -982,8 +996,8 @@ keep me updated
                 }],
                 end_turn: None,
                 phase: None,
-            },
-            ResponseItem::Message {
+            }),
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "developer".to_string(),
                 content: vec![ContentItem::InputText {
@@ -991,8 +1005,8 @@ keep me updated
                 }],
                 end_turn: None,
                 phase: None,
-            },
-            ResponseItem::Message {
+            }),
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "user".to_string(),
                 content: vec![ContentItem::InputText {
@@ -1000,7 +1014,7 @@ keep me updated
                 }],
                 end_turn: None,
                 phase: None,
-            },
+            }),
         ];
         assert_eq!(refreshed, expected);
     }

codex-rs/core/src/compact_remote.rs

@@ -77,7 +77,12 @@ async fn run_remote_compact_task_inner_impl(
     let ghost_snapshots: Vec<ResponseItem> = history
         .raw_items()
         .iter()
-        .filter(|item| matches!(item, ResponseItem::GhostSnapshot { .. }))
+        .filter(|item| {
+            matches!(
+                item,
+                ResponseItem::GhostSnapshot(codex_protocol::models::GhostSnapshot { .. })
+            )
+        })
         .cloned()
         .collect();
 

codex-rs/core/src/context_manager/context_discoverable.rs

@@ -0,0 +1,42 @@
+use crate::truncate::TruncationPolicy;
+use crate::truncate::truncate_function_output_items_with_policy;
+use crate::truncate::truncate_text;
+use codex_protocol::models::CustomToolCallOutput;
+use codex_protocol::models::FunctionCallOutput;
+use codex_protocol::models::FunctionCallOutputBody;
+use codex_protocol::models::FunctionCallOutputPayload;
+use codex_protocol::models::ResponseItem;
+
+pub(super) trait ContextDiscoverable {
+    fn discoverable_history_item(&self, policy: TruncationPolicy) -> ResponseItem;
+}
+
+impl ContextDiscoverable for FunctionCallOutput {
+    fn discoverable_history_item(&self, policy: TruncationPolicy) -> ResponseItem {
+        let body = match &self.output.body {
+            FunctionCallOutputBody::Text(content) => {
+                FunctionCallOutputBody::Text(truncate_text(content, policy))
+            }
+            FunctionCallOutputBody::ContentItems(items) => FunctionCallOutputBody::ContentItems(
+                truncate_function_output_items_with_policy(items, policy),
+            ),
+        };
+
+        ResponseItem::FunctionCallOutput(FunctionCallOutput {
+            call_id: self.call_id.clone(),
+            output: FunctionCallOutputPayload {
+                body,
+                success: self.output.success,
+            },
+        })
+    }
+}
+
+impl ContextDiscoverable for CustomToolCallOutput {
+    fn discoverable_history_item(&self, policy: TruncationPolicy) -> ResponseItem {
+        ResponseItem::CustomToolCallOutput(CustomToolCallOutput {
+            call_id: self.call_id.clone(),
+            output: truncate_text(&self.output, policy),
+        })
+    }
+}

codex-rs/core/src/context_manager/history.rs

@@ -1,4 +1,5 @@
 use crate::codex::TurnContext;
+use crate::context_manager::context_discoverable::ContextDiscoverable;
 use crate::context_manager::normalize;
 use crate::instructions::SkillInstructions;
 use crate::instructions::UserInstructions;
@@ -6,14 +7,10 @@ use crate::session_prefix::is_session_prefix;
 use crate::truncate::TruncationPolicy;
 use crate::truncate::approx_token_count;
 use crate::truncate::approx_tokens_from_byte_count;
-use crate::truncate::truncate_function_output_items_with_policy;
-use crate::truncate::truncate_text;
 use crate::user_shell_command::is_user_shell_command_text;
 use codex_protocol::models::BaseInstructions;
 use codex_protocol::models::ContentItem;
-use codex_protocol::models::FunctionCallOutputBody;
 use codex_protocol::models::FunctionCallOutputContentItem;
-use codex_protocol::models::FunctionCallOutputPayload;
 use codex_protocol::models::ResponseItem;
 use codex_protocol::protocol::TokenUsage;
 use codex_protocol::protocol::TokenUsageInfo;
@@ -60,7 +57,10 @@ impl ContextManager {
     {
         for item in items {
             let item_ref = item.deref();
-            let is_ghost_snapshot = matches!(item_ref, ResponseItem::GhostSnapshot { .. });
+            let is_ghost_snapshot = matches!(
+                item_ref,
+                ResponseItem::GhostSnapshot(codex_protocol::models::GhostSnapshot { .. })
+            );
             if !is_api_message(item_ref) && !is_ghost_snapshot {
                 continue;
             }
@@ -74,8 +74,12 @@ impl ContextManager {
     /// normalization and drop un-suited items.
     pub(crate) fn for_prompt(mut self) -> Vec<ResponseItem> {
         self.normalize_history();
-        self.items
-            .retain(|item| !matches!(item, ResponseItem::GhostSnapshot { .. }));
+        self.items.retain(|item| {
+            !matches!(
+                item,
+                ResponseItem::GhostSnapshot(codex_protocol::models::GhostSnapshot { .. })
+            )
+        });
         self.items
     }
 
@@ -138,14 +142,17 @@ impl ContextManager {
     /// Returns true when a tool image was replaced, false otherwise.
     pub(crate) fn replace_last_turn_images(&mut self, placeholder: &str) -> bool {
         let Some(index) = self.items.iter().rposition(|item| {
-            matches!(item, ResponseItem::FunctionCallOutput { .. })
-                || matches!(item, ResponseItem::Message { role, .. } if role == "user")
+            matches!(item, ResponseItem::FunctionCallOutput(codex_protocol::models::FunctionCallOutput { .. }))
+                || matches!(item, ResponseItem::Message(codex_protocol::models::Message { role, .. }) if role == "user")
         }) else {
             return false;
         };
 
         match &mut self.items[index] {
-            ResponseItem::FunctionCallOutput { output, .. } => {
+            ResponseItem::FunctionCallOutput(codex_protocol::models::FunctionCallOutput {
+                output,
+                ..
+            }) => {
                 let Some(content_items) = output.content_items_mut() else {
                     return false;
                 };
@@ -161,7 +168,11 @@ impl ContextManager {
                 }
                 replaced
             }
-            ResponseItem::Message { role, .. } if role == "user" => false,
+            ResponseItem::Message(codex_protocol::models::Message { role, .. })
+                if role == "user" =>
+            {
+                false
+            }
             _ => false,
         }
     }
@@ -214,7 +225,7 @@ impl ContextManager {
         let Some(last_user_index) = self
             .items
             .iter()
-            .rposition(|item| matches!(item, ResponseItem::Message { role, .. } if role == "user"))
+            .rposition(|item| matches!(item, ResponseItem::Message(codex_protocol::models::Message { role, .. }) if role == "user"))
         else {
             return 0;
         };
@@ -225,10 +236,10 @@ impl ContextManager {
             .filter(|item| {
                 matches!(
                     item,
-                    ResponseItem::Reasoning {
+                    ResponseItem::Reasoning(codex_protocol::models::Reasoning {
                         encrypted_content: Some(_),
                         ..
-                    }
+                    })
                 )
             })
             .fold(0i64, |acc, item| {
@@ -279,44 +290,21 @@ impl ContextManager {
     fn process_item(&self, item: &ResponseItem, policy: TruncationPolicy) -> ResponseItem {
         let policy_with_serialization_budget = policy * 1.2;
         match item {
-            ResponseItem::FunctionCallOutput { call_id, output } => {
-                let body = match &output.body {
-                    FunctionCallOutputBody::Text(content) => FunctionCallOutputBody::Text(
-                        truncate_text(content, policy_with_serialization_budget),
-                    ),
-                    FunctionCallOutputBody::ContentItems(items) => {
-                        FunctionCallOutputBody::ContentItems(
-                            truncate_function_output_items_with_policy(
-                                items,
-                                policy_with_serialization_budget,
-                            ),
-                        )
-                    }
-                };
-                ResponseItem::FunctionCallOutput {
-                    call_id: call_id.clone(),
-                    output: FunctionCallOutputPayload {
-                        body,
-                        success: output.success,
-                    },
-                }
-            }
-            ResponseItem::CustomToolCallOutput { call_id, output } => {
-                let truncated = truncate_text(output, policy_with_serialization_budget);
-                ResponseItem::CustomToolCallOutput {
-                    call_id: call_id.clone(),
-                    output: truncated,
-                }
-            }
-            ResponseItem::Message { .. }
-            | ResponseItem::Reasoning { .. }
-            | ResponseItem::LocalShellCall { .. }
-            | ResponseItem::FunctionCall { .. }
-            | ResponseItem::WebSearchCall { .. }
-            | ResponseItem::CustomToolCall { .. }
-            | ResponseItem::Compaction { .. }
-            | ResponseItem::GhostSnapshot { .. }
+            ResponseItem::Message(_)
+            | ResponseItem::Reasoning(_)
+            | ResponseItem::LocalShellCall(_)
+            | ResponseItem::FunctionCall(_)
+            | ResponseItem::CustomToolCall(_)
+            | ResponseItem::WebSearchCall(_)
+            | ResponseItem::Compaction(_)
+            | ResponseItem::GhostSnapshot(_)
             | ResponseItem::Other => item.clone(),
+            ResponseItem::FunctionCallOutput(item) => {
+                item.discoverable_history_item(policy_with_serialization_budget)
+            }
+            ResponseItem::CustomToolCallOutput(item) => {
+                item.discoverable_history_item(policy_with_serialization_budget)
+            }
         }
     }
 }
@@ -325,16 +313,20 @@ impl ContextManager {
 /// tool calls, tool outputs, shell calls, and web-search calls).
 fn is_api_message(message: &ResponseItem) -> bool {
     match message {
-        ResponseItem::Message { role, .. } => role.as_str() != "system",
-        ResponseItem::FunctionCallOutput { .. }
-        | ResponseItem::FunctionCall { .. }
-        | ResponseItem::CustomToolCall { .. }
-        | ResponseItem::CustomToolCallOutput { .. }
-        | ResponseItem::LocalShellCall { .. }
-        | ResponseItem::Reasoning { .. }
-        | ResponseItem::WebSearchCall { .. }
-        | ResponseItem::Compaction { .. } => true,
-        ResponseItem::GhostSnapshot { .. } => false,
+        ResponseItem::Message(codex_protocol::models::Message { role, .. }) => {
+            role.as_str() != "system"
+        }
+        ResponseItem::FunctionCallOutput(codex_protocol::models::FunctionCallOutput { .. })
+        | ResponseItem::FunctionCall(codex_protocol::models::FunctionCall { .. })
+        | ResponseItem::CustomToolCall(codex_protocol::models::CustomToolCall { .. })
+        | ResponseItem::CustomToolCallOutput(codex_protocol::models::CustomToolCallOutput {
+            ..
+        })
+        | ResponseItem::LocalShellCall(codex_protocol::models::LocalShellCall { .. })
+        | ResponseItem::Reasoning(codex_protocol::models::Reasoning { .. })
+        | ResponseItem::WebSearchCall(codex_protocol::models::WebSearchCall { .. })
+        | ResponseItem::Compaction(codex_protocol::models::Compaction { .. }) => true,
+        ResponseItem::GhostSnapshot(codex_protocol::models::GhostSnapshot { .. }) => false,
         ResponseItem::Other => false,
     }
 }
@@ -349,14 +341,14 @@ fn estimate_reasoning_length(encoded_len: usize) -> usize {
 
 fn estimate_item_token_count(item: &ResponseItem) -> i64 {
     match item {
-        ResponseItem::GhostSnapshot { .. } => 0,
-        ResponseItem::Reasoning {
+        ResponseItem::GhostSnapshot(codex_protocol::models::GhostSnapshot { .. }) => 0,
+        ResponseItem::Reasoning(codex_protocol::models::Reasoning {
             encrypted_content: Some(content),
             ..
-        }
-        | ResponseItem::Compaction {
+        })
+        | ResponseItem::Compaction(codex_protocol::models::Compaction {
             encrypted_content: content,
-        } => {
+        }) => {
             let reasoning_bytes = estimate_reasoning_length(content.len());
             i64::try_from(approx_tokens_from_byte_count(reasoning_bytes)).unwrap_or(i64::MAX)
         }
@@ -370,12 +362,15 @@ fn estimate_item_token_count(item: &ResponseItem) -> i64 {
 pub(crate) fn is_codex_generated_item(item: &ResponseItem) -> bool {
     matches!(
         item,
-        ResponseItem::FunctionCallOutput { .. } | ResponseItem::CustomToolCallOutput { .. }
-    ) || matches!(item, ResponseItem::Message { role, .. } if role == "developer")
+        ResponseItem::FunctionCallOutput(codex_protocol::models::FunctionCallOutput { .. })
+            | ResponseItem::CustomToolCallOutput(
+                codex_protocol::models::CustomToolCallOutput { .. }
+            )
+    ) || matches!(item, ResponseItem::Message(codex_protocol::models::Message { role, .. }) if role == "developer")
 }
 
 pub(crate) fn is_user_turn_boundary(item: &ResponseItem) -> bool {
-    let ResponseItem::Message { role, content, .. } = item else {
+    let ResponseItem::Message(codex_protocol::models::Message { role, content, .. }) = item else {
         return false;
     };
 

codex-rs/core/src/context_manager/history_tests.rs

@@ -19,7 +19,7 @@ const EXEC_FORMAT_MAX_BYTES: usize = 10_000;
 const EXEC_FORMAT_MAX_TOKENS: usize = 2_500;
 
 fn assistant_msg(text: &str) -> ResponseItem {
-    ResponseItem::Message {
+    ResponseItem::Message(codex_protocol::models::Message {
         id: None,
         role: "assistant".to_string(),
         content: vec![ContentItem::OutputText {
@@ -27,7 +27,7 @@ fn assistant_msg(text: &str) -> ResponseItem {
         }],
         end_turn: None,
         phase: None,
-    }
+    })
 }
 
 fn create_history_with_items(items: Vec<ResponseItem>) -> ContextManager {
@@ -39,7 +39,7 @@ fn create_history_with_items(items: Vec<ResponseItem>) -> ContextManager {
 }
 
 fn user_msg(text: &str) -> ResponseItem {
-    ResponseItem::Message {
+    ResponseItem::Message(codex_protocol::models::Message {
         id: None,
         role: "user".to_string(),
         content: vec![ContentItem::OutputText {
@@ -47,11 +47,11 @@ fn user_msg(text: &str) -> ResponseItem {
         }],
         end_turn: None,
         phase: None,
-    }
+    })
 }
 
 fn user_input_text_msg(text: &str) -> ResponseItem {
-    ResponseItem::Message {
+    ResponseItem::Message(codex_protocol::models::Message {
         id: None,
         role: "user".to_string(),
         content: vec![ContentItem::InputText {
@@ -59,25 +59,25 @@ fn user_input_text_msg(text: &str) -> ResponseItem {
         }],
         end_turn: None,
         phase: None,
-    }
+    })
 }
 
 fn function_call_output(call_id: &str, content: &str) -> ResponseItem {
-    ResponseItem::FunctionCallOutput {
+    ResponseItem::FunctionCallOutput(codex_protocol::models::FunctionCallOutput {
         call_id: call_id.to_string(),
         output: FunctionCallOutputPayload::from_text(content.to_string()),
-    }
+    })
 }
 
 fn custom_tool_call_output(call_id: &str, output: &str) -> ResponseItem {
-    ResponseItem::CustomToolCallOutput {
+    ResponseItem::CustomToolCallOutput(codex_protocol::models::CustomToolCallOutput {
         call_id: call_id.to_string(),
         output: output.to_string(),
-    }
+    })
 }
 
 fn reasoning_msg(text: &str) -> ResponseItem {
-    ResponseItem::Reasoning {
+    ResponseItem::Reasoning(codex_protocol::models::Reasoning {
         id: String::new(),
         summary: vec![ReasoningItemReasoningSummary::SummaryText {
             text: "summary".to_string(),
@@ -86,18 +86,18 @@ fn reasoning_msg(text: &str) -> ResponseItem {
             text: text.to_string(),
         }]),
         encrypted_content: None,
-    }
+    })
 }
 
 fn reasoning_with_encrypted_content(len: usize) -> ResponseItem {
-    ResponseItem::Reasoning {
+    ResponseItem::Reasoning(codex_protocol::models::Reasoning {
         id: String::new(),
         summary: vec![ReasoningItemReasoningSummary::SummaryText {
             text: "summary".to_string(),
         }],
         content: None,
         encrypted_content: Some("a".repeat(len)),
-    }
+    })
 }
 
 fn truncate_exec_output(content: &str) -> String {
@@ -113,7 +113,7 @@ fn filters_non_api_messages() {
     let mut h = ContextManager::default();
     let policy = TruncationPolicy::Tokens(10_000);
     // System message is not API messages; Other is ignored.
-    let system = ResponseItem::Message {
+    let system = ResponseItem::Message(codex_protocol::models::Message {
         id: None,
         role: "system".to_string(),
         content: vec![ContentItem::OutputText {
@@ -121,7 +121,7 @@ fn filters_non_api_messages() {
         }],
         end_turn: None,
         phase: None,
-    };
+    });
     let reasoning = reasoning_msg("thinking...");
     h.record_items([&system, &reasoning, &ResponseItem::Other], policy);
 
@@ -134,7 +134,7 @@ fn filters_non_api_messages() {
     assert_eq!(
         items,
         vec![
-            ResponseItem::Reasoning {
+            ResponseItem::Reasoning(codex_protocol::models::Reasoning {
                 id: String::new(),
                 summary: vec![ReasoningItemReasoningSummary::SummaryText {
                     text: "summary".to_string(),
@@ -143,8 +143,8 @@ fn filters_non_api_messages() {
                     text: "thinking...".to_string(),
                 }]),
                 encrypted_content: None,
-            },
-            ResponseItem::Message {
+            }),
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "user".to_string(),
                 content: vec![ContentItem::OutputText {
@@ -152,8 +152,8 @@ fn filters_non_api_messages() {
                 }],
                 end_turn: None,
                 phase: None,
-            },
-            ResponseItem::Message {
+            }),
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "assistant".to_string(),
                 content: vec![ContentItem::OutputText {
@@ -161,7 +161,7 @@ fn filters_non_api_messages() {
                 }],
                 end_turn: None,
                 phase: None,
-            }
+            })
         ]
     );
 }
@@ -210,12 +210,14 @@ fn trailing_codex_generated_tokens_stop_at_first_non_generated_item() {
 
 #[test]
 fn trailing_codex_generated_tokens_exclude_function_call_tail() {
-    let history = create_history_with_items(vec![ResponseItem::FunctionCall {
-        id: None,
-        name: "not-generated".to_string(),
-        arguments: "{}".to_string(),
-        call_id: "call-tail".to_string(),
-    }]);
+    let history = create_history_with_items(vec![ResponseItem::FunctionCall(
+        codex_protocol::models::FunctionCall {
+            id: None,
+            name: "not-generated".to_string(),
+            arguments: "{}".to_string(),
+            call_id: "call-tail".to_string(),
+        },
+    )]);
 
     assert_eq!(history.get_trailing_codex_generated_items_tokens(), 0);
 }
@@ -247,9 +249,11 @@ fn total_token_usage_includes_only_trailing_codex_generated_items() {
 
 #[test]
 fn get_history_for_prompt_drops_ghost_commits() {
-    let items = vec![ResponseItem::GhostSnapshot {
-        ghost_commit: GhostCommit::new("ghost-1".to_string(), None, Vec::new(), Vec::new()),
-    }];
+    let items = vec![ResponseItem::GhostSnapshot(
+        codex_protocol::models::GhostSnapshot {
+            ghost_commit: GhostCommit::new("ghost-1".to_string(), None, Vec::new(), Vec::new()),
+        },
+    )];
     let history = create_history_with_items(items);
     let filtered = history.for_prompt();
     assert_eq!(filtered, vec![]);
@@ -280,16 +284,16 @@ fn estimate_token_count_with_base_instructions_uses_provided_text() {
 #[test]
 fn remove_first_item_removes_matching_output_for_function_call() {
     let items = vec![
-        ResponseItem::FunctionCall {
+        ResponseItem::FunctionCall(codex_protocol::models::FunctionCall {
             id: None,
             name: "do_it".to_string(),
             arguments: "{}".to_string(),
             call_id: "call-1".to_string(),
-        },
-        ResponseItem::FunctionCallOutput {
+        }),
+        ResponseItem::FunctionCallOutput(codex_protocol::models::FunctionCallOutput {
             call_id: "call-1".to_string(),
             output: FunctionCallOutputPayload::from_text("ok".to_string()),
-        },
+        }),
     ];
     let mut h = create_history_with_items(items);
     h.remove_first_item();
@@ -299,16 +303,16 @@ fn remove_first_item_removes_matching_output_for_function_call() {
 #[test]
 fn remove_first_item_removes_matching_call_for_output() {
     let items = vec![
-        ResponseItem::FunctionCallOutput {
+        ResponseItem::FunctionCallOutput(codex_protocol::models::FunctionCallOutput {
             call_id: "call-2".to_string(),
             output: FunctionCallOutputPayload::from_text("ok".to_string()),
-        },
-        ResponseItem::FunctionCall {
+        }),
+        ResponseItem::FunctionCall(codex_protocol::models::FunctionCall {
             id: None,
             name: "do_it".to_string(),
             arguments: "{}".to_string(),
             call_id: "call-2".to_string(),
-        },
+        }),
     ];
     let mut h = create_history_with_items(items);
     h.remove_first_item();
@@ -319,16 +323,16 @@ fn remove_first_item_removes_matching_call_for_output() {
 fn remove_last_item_removes_matching_call_for_output() {
     let items = vec![
         user_msg("before tool call"),
-        ResponseItem::FunctionCall {
+        ResponseItem::FunctionCall(codex_protocol::models::FunctionCall {
             id: None,
             name: "do_it".to_string(),
             arguments: "{}".to_string(),
             call_id: "call-delete-last".to_string(),
-        },
-        ResponseItem::FunctionCallOutput {
+        }),
+        ResponseItem::FunctionCallOutput(codex_protocol::models::FunctionCallOutput {
             call_id: "call-delete-last".to_string(),
             output: FunctionCallOutputPayload::from_text("ok".to_string()),
-        },
+        }),
     ];
     let mut h = create_history_with_items(items);
 
@@ -340,7 +344,7 @@ fn remove_last_item_removes_matching_call_for_output() {
 fn replace_last_turn_images_replaces_tool_output_images() {
     let items = vec![
         user_input_text_msg("hi"),
-        ResponseItem::FunctionCallOutput {
+        ResponseItem::FunctionCallOutput(codex_protocol::models::FunctionCallOutput {
             call_id: "call-1".to_string(),
             output: FunctionCallOutputPayload {
                 body: FunctionCallOutputBody::ContentItems(vec![
@@ -350,7 +354,7 @@ fn replace_last_turn_images_replaces_tool_output_images() {
                 ]),
                 success: Some(true),
             },
-        },
+        }),
     ];
     let mut history = create_history_with_items(items);
 
@@ -360,7 +364,7 @@ fn replace_last_turn_images_replaces_tool_output_images() {
         history.raw_items(),
         vec![
             user_input_text_msg("hi"),
-            ResponseItem::FunctionCallOutput {
+            ResponseItem::FunctionCallOutput(codex_protocol::models::FunctionCallOutput {
                 call_id: "call-1".to_string(),
                 output: FunctionCallOutputPayload {
                     body: FunctionCallOutputBody::ContentItems(vec![
@@ -370,14 +374,14 @@ fn replace_last_turn_images_replaces_tool_output_images() {
                     ]),
                     success: Some(true),
                 },
-            },
+            }),
         ]
     );
 }
 
 #[test]
 fn replace_last_turn_images_does_not_touch_user_images() {
-    let items = vec![ResponseItem::Message {
+    let items = vec![ResponseItem::Message(codex_protocol::models::Message {
         id: None,
         role: "user".to_string(),
         content: vec![ContentItem::InputImage {
@@ -385,7 +389,7 @@ fn replace_last_turn_images_does_not_touch_user_images() {
         }],
         end_turn: None,
         phase: None,
-    }];
+    })];
     let mut history = create_history_with_items(items.clone());
 
     assert!(!history.replace_last_turn_images("Invalid image"));
@@ -395,7 +399,7 @@ fn replace_last_turn_images_does_not_touch_user_images() {
 #[test]
 fn remove_first_item_handles_local_shell_pair() {
     let items = vec![
-        ResponseItem::LocalShellCall {
+        ResponseItem::LocalShellCall(codex_protocol::models::LocalShellCall {
             id: None,
             call_id: Some("call-3".to_string()),
             status: LocalShellStatus::Completed,
@@ -406,11 +410,11 @@ fn remove_first_item_handles_local_shell_pair() {
                 env: None,
                 user: None,
             }),
-        },
-        ResponseItem::FunctionCallOutput {
+        }),
+        ResponseItem::FunctionCallOutput(codex_protocol::models::FunctionCallOutput {
             call_id: "call-3".to_string(),
             output: FunctionCallOutputPayload::from_text("ok".to_string()),
-        },
+        }),
     ];
     let mut h = create_history_with_items(items);
     h.remove_first_item();
@@ -541,17 +545,17 @@ fn drop_last_n_user_turns_ignores_session_prefix_user_messages() {
 #[test]
 fn remove_first_item_handles_custom_tool_pair() {
     let items = vec![
-        ResponseItem::CustomToolCall {
+        ResponseItem::CustomToolCall(codex_protocol::models::CustomToolCall {
             id: None,
             status: None,
             call_id: "tool-1".to_string(),
             name: "my_tool".to_string(),
             input: "{}".to_string(),
-        },
-        ResponseItem::CustomToolCallOutput {
+        }),
+        ResponseItem::CustomToolCallOutput(codex_protocol::models::CustomToolCallOutput {
             call_id: "tool-1".to_string(),
             output: "ok".to_string(),
-        },
+        }),
     ];
     let mut h = create_history_with_items(items);
     h.remove_first_item();
@@ -561,7 +565,7 @@ fn remove_first_item_handles_custom_tool_pair() {
 #[test]
 fn normalization_retains_local_shell_outputs() {
     let items = vec![
-        ResponseItem::LocalShellCall {
+        ResponseItem::LocalShellCall(codex_protocol::models::LocalShellCall {
             id: None,
             call_id: Some("shell-1".to_string()),
             status: LocalShellStatus::Completed,
@@ -572,11 +576,11 @@ fn normalization_retains_local_shell_outputs() {
                 env: None,
                 user: None,
             }),
-        },
-        ResponseItem::FunctionCallOutput {
+        }),
+        ResponseItem::FunctionCallOutput(codex_protocol::models::FunctionCallOutput {
             call_id: "shell-1".to_string(),
             output: FunctionCallOutputPayload::from_text("Total output lines: 1\n\nok".to_string()),
-        },
+        }),
     ];
 
     let history = create_history_with_items(items.clone());
@@ -592,19 +596,22 @@ fn record_items_truncates_function_call_output_content() {
     let policy = TruncationPolicy::Tokens(1_000);
     let long_line = "a very long line to trigger truncation\n";
     let long_output = long_line.repeat(2_500);
-    let item = ResponseItem::FunctionCallOutput {
+    let item = ResponseItem::FunctionCallOutput(codex_protocol::models::FunctionCallOutput {
         call_id: "call-100".to_string(),
         output: FunctionCallOutputPayload {
             body: FunctionCallOutputBody::Text(long_output.clone()),
             success: Some(true),
         },
-    };
+    });
 
     history.record_items([&item], policy);
 
     assert_eq!(history.items.len(), 1);
     match &history.items[0] {
-        ResponseItem::FunctionCallOutput { output, .. } => {
+        ResponseItem::FunctionCallOutput(codex_protocol::models::FunctionCallOutput {
+            output,
+            ..
+        }) => {
             let content = output.text_content().unwrap_or_default();
             assert_ne!(content, long_output);
             assert!(
@@ -626,16 +633,19 @@ fn record_items_truncates_custom_tool_call_output_content() {
     let policy = TruncationPolicy::Tokens(1_000);
     let line = "custom output that is very long\n";
     let long_output = line.repeat(2_500);
-    let item = ResponseItem::CustomToolCallOutput {
+    let item = ResponseItem::CustomToolCallOutput(codex_protocol::models::CustomToolCallOutput {
         call_id: "tool-200".to_string(),
         output: long_output.clone(),
-    };
+    });
 
     history.record_items([&item], policy);
 
     assert_eq!(history.items.len(), 1);
     match &history.items[0] {
-        ResponseItem::CustomToolCallOutput { output, .. } => {
+        ResponseItem::CustomToolCallOutput(codex_protocol::models::CustomToolCallOutput {
+            output,
+            ..
+        }) => {
             assert_ne!(output, &long_output);
             assert!(
                 output.contains("tokens truncated"),
@@ -655,18 +665,21 @@ fn record_items_respects_custom_token_limit() {
     let mut history = ContextManager::new();
     let policy = TruncationPolicy::Tokens(10);
     let long_output = "tokenized content repeated many times ".repeat(200);
-    let item = ResponseItem::FunctionCallOutput {
+    let item = ResponseItem::FunctionCallOutput(codex_protocol::models::FunctionCallOutput {
         call_id: "call-custom-limit".to_string(),
         output: FunctionCallOutputPayload {
             body: FunctionCallOutputBody::Text(long_output),
             success: Some(true),
         },
-    };
+    });
 
     history.record_items([&item], policy);
 
     let stored = match &history.items[0] {
-        ResponseItem::FunctionCallOutput { output, .. } => output,
+        ResponseItem::FunctionCallOutput(codex_protocol::models::FunctionCallOutput {
+            output,
+            ..
+        }) => output,
         other => panic!("unexpected history item: {other:?}"),
     };
     assert!(
@@ -774,12 +787,14 @@ fn format_exec_output_prefers_line_marker_when_both_limits_exceeded() {
 #[cfg(not(debug_assertions))]
 #[test]
 fn normalize_adds_missing_output_for_function_call() {
-    let items = vec![ResponseItem::FunctionCall {
-        id: None,
-        name: "do_it".to_string(),
-        arguments: "{}".to_string(),
-        call_id: "call-x".to_string(),
-    }];
+    let items = vec![ResponseItem::FunctionCall(
+        codex_protocol::models::FunctionCall {
+            id: None,
+            name: "do_it".to_string(),
+            arguments: "{}".to_string(),
+            call_id: "call-x".to_string(),
+        },
+    )];
     let mut h = create_history_with_items(items);
 
     h.normalize_history();
@@ -787,16 +802,16 @@ fn normalize_adds_missing_output_for_function_call() {
     assert_eq!(
         h.raw_items(),
         vec![
-            ResponseItem::FunctionCall {
+            ResponseItem::FunctionCall(codex_protocol::models::FunctionCall {
                 id: None,
                 name: "do_it".to_string(),
                 arguments: "{}".to_string(),
                 call_id: "call-x".to_string(),
-            },
-            ResponseItem::FunctionCallOutput {
+            }),
+            ResponseItem::FunctionCallOutput(codex_protocol::models::FunctionCallOutput {
                 call_id: "call-x".to_string(),
                 output: FunctionCallOutputPayload::from_text("aborted".to_string()),
-            },
+            }),
         ]
     );
 }
@@ -804,13 +819,15 @@ fn normalize_adds_missing_output_for_function_call() {
 #[cfg(not(debug_assertions))]
 #[test]
 fn normalize_adds_missing_output_for_custom_tool_call() {
-    let items = vec![ResponseItem::CustomToolCall {
-        id: None,
-        status: None,
-        call_id: "tool-x".to_string(),
-        name: "custom".to_string(),
-        input: "{}".to_string(),
-    }];
+    let items = vec![ResponseItem::CustomToolCall(
+        codex_protocol::models::CustomToolCall {
+            id: None,
+            status: None,
+            call_id: "tool-x".to_string(),
+            name: "custom".to_string(),
+            input: "{}".to_string(),
+        },
+    )];
     let mut h = create_history_with_items(items);
 
     h.normalize_history();
@@ -818,17 +835,17 @@ fn normalize_adds_missing_output_for_custom_tool_call() {
     assert_eq!(
         h.raw_items(),
         vec![
-            ResponseItem::CustomToolCall {
+            ResponseItem::CustomToolCall(codex_protocol::models::CustomToolCall {
                 id: None,
                 status: None,
                 call_id: "tool-x".to_string(),
                 name: "custom".to_string(),
                 input: "{}".to_string(),
-            },
-            ResponseItem::CustomToolCallOutput {
+            }),
+            ResponseItem::CustomToolCallOutput(codex_protocol::models::CustomToolCallOutput {
                 call_id: "tool-x".to_string(),
                 output: "aborted".to_string(),
-            },
+            }),
         ]
     );
 }
@@ -836,18 +853,20 @@ fn normalize_adds_missing_output_for_custom_tool_call() {
 #[cfg(not(debug_assertions))]
 #[test]
 fn normalize_adds_missing_output_for_local_shell_call_with_id() {
-    let items = vec![ResponseItem::LocalShellCall {
-        id: None,
-        call_id: Some("shell-1".to_string()),
-        status: LocalShellStatus::Completed,
-        action: LocalShellAction::Exec(LocalShellExecAction {
-            command: vec!["echo".to_string(), "hi".to_string()],
-            timeout_ms: None,
-            working_directory: None,
-            env: None,
-            user: None,
-        }),
-    }];
+    let items = vec![ResponseItem::LocalShellCall(
+        codex_protocol::models::LocalShellCall {
+            id: None,
+            call_id: Some("shell-1".to_string()),
+            status: LocalShellStatus::Completed,
+            action: LocalShellAction::Exec(LocalShellExecAction {
+                command: vec!["echo".to_string(), "hi".to_string()],
+                timeout_ms: None,
+                working_directory: None,
+                env: None,
+                user: None,
+            }),
+        },
+    )];
     let mut h = create_history_with_items(items);
 
     h.normalize_history();
@@ -855,7 +874,7 @@ fn normalize_adds_missing_output_for_local_shell_call_with_id() {
     assert_eq!(
         h.raw_items(),
         vec![
-            ResponseItem::LocalShellCall {
+            ResponseItem::LocalShellCall(codex_protocol::models::LocalShellCall {
                 id: None,
                 call_id: Some("shell-1".to_string()),
                 status: LocalShellStatus::Completed,
@@ -866,11 +885,11 @@ fn normalize_adds_missing_output_for_local_shell_call_with_id() {
                     env: None,
                     user: None,
                 }),
-            },
-            ResponseItem::FunctionCallOutput {
+            }),
+            ResponseItem::FunctionCallOutput(codex_protocol::models::FunctionCallOutput {
                 call_id: "shell-1".to_string(),
                 output: FunctionCallOutputPayload::from_text("aborted".to_string()),
-            },
+            }),
         ]
     );
 }
@@ -878,10 +897,12 @@ fn normalize_adds_missing_output_for_local_shell_call_with_id() {
 #[cfg(not(debug_assertions))]
 #[test]
 fn normalize_removes_orphan_function_call_output() {
-    let items = vec![ResponseItem::FunctionCallOutput {
-        call_id: "orphan-1".to_string(),
-        output: FunctionCallOutputPayload::from_text("ok".to_string()),
-    }];
+    let items = vec![ResponseItem::FunctionCallOutput(
+        codex_protocol::models::FunctionCallOutput {
+            call_id: "orphan-1".to_string(),
+            output: FunctionCallOutputPayload::from_text("ok".to_string()),
+        },
+    )];
     let mut h = create_history_with_items(items);
 
     h.normalize_history();
@@ -892,10 +913,12 @@ fn normalize_removes_orphan_function_call_output() {
 #[cfg(not(debug_assertions))]
 #[test]
 fn normalize_removes_orphan_custom_tool_call_output() {
-    let items = vec![ResponseItem::CustomToolCallOutput {
-        call_id: "orphan-2".to_string(),
-        output: "ok".to_string(),
-    }];
+    let items = vec![ResponseItem::CustomToolCallOutput(
+        codex_protocol::models::CustomToolCallOutput {
+            call_id: "orphan-2".to_string(),
+            output: "ok".to_string(),
+        },
+    )];
     let mut h = create_history_with_items(items);
 
     h.normalize_history();
@@ -908,27 +931,27 @@ fn normalize_removes_orphan_custom_tool_call_output() {
 fn normalize_mixed_inserts_and_removals() {
     let items = vec![
         // Will get an inserted output
-        ResponseItem::FunctionCall {
+        ResponseItem::FunctionCall(codex_protocol::models::FunctionCall {
             id: None,
             name: "f1".to_string(),
             arguments: "{}".to_string(),
             call_id: "c1".to_string(),
-        },
+        }),
         // Orphan output that should be removed
-        ResponseItem::FunctionCallOutput {
+        ResponseItem::FunctionCallOutput(codex_protocol::models::FunctionCallOutput {
             call_id: "c2".to_string(),
             output: FunctionCallOutputPayload::from_text("ok".to_string()),
-        },
+        }),
         // Will get an inserted custom tool output
-        ResponseItem::CustomToolCall {
+        ResponseItem::CustomToolCall(codex_protocol::models::CustomToolCall {
             id: None,
             status: None,
             call_id: "t1".to_string(),
             name: "tool".to_string(),
             input: "{}".to_string(),
-        },
+        }),
         // Local shell call also gets an inserted function call output
-        ResponseItem::LocalShellCall {
+        ResponseItem::LocalShellCall(codex_protocol::models::LocalShellCall {
             id: None,
             call_id: Some("s1".to_string()),
             status: LocalShellStatus::Completed,
@@ -939,7 +962,7 @@ fn normalize_mixed_inserts_and_removals() {
                 env: None,
                 user: None,
             }),
-        },
+        }),
     ];
     let mut h = create_history_with_items(items);
 
@@ -948,28 +971,28 @@ fn normalize_mixed_inserts_and_removals() {
     assert_eq!(
         h.raw_items(),
         vec![
-            ResponseItem::FunctionCall {
+            ResponseItem::FunctionCall(codex_protocol::models::FunctionCall {
                 id: None,
                 name: "f1".to_string(),
                 arguments: "{}".to_string(),
                 call_id: "c1".to_string(),
-            },
-            ResponseItem::FunctionCallOutput {
+            }),
+            ResponseItem::FunctionCallOutput(codex_protocol::models::FunctionCallOutput {
                 call_id: "c1".to_string(),
                 output: FunctionCallOutputPayload::from_text("aborted".to_string()),
-            },
-            ResponseItem::CustomToolCall {
+            }),
+            ResponseItem::CustomToolCall(codex_protocol::models::CustomToolCall {
                 id: None,
                 status: None,
                 call_id: "t1".to_string(),
                 name: "tool".to_string(),
                 input: "{}".to_string(),
-            },
-            ResponseItem::CustomToolCallOutput {
+            }),
+            ResponseItem::CustomToolCallOutput(codex_protocol::models::CustomToolCallOutput {
                 call_id: "t1".to_string(),
                 output: "aborted".to_string(),
-            },
-            ResponseItem::LocalShellCall {
+            }),
+            ResponseItem::LocalShellCall(codex_protocol::models::LocalShellCall {
                 id: None,
                 call_id: Some("s1".to_string()),
                 status: LocalShellStatus::Completed,
@@ -980,38 +1003,40 @@ fn normalize_mixed_inserts_and_removals() {
                     env: None,
                     user: None,
                 }),
-            },
-            ResponseItem::FunctionCallOutput {
+            }),
+            ResponseItem::FunctionCallOutput(codex_protocol::models::FunctionCallOutput {
                 call_id: "s1".to_string(),
                 output: FunctionCallOutputPayload::from_text("aborted".to_string()),
-            },
+            }),
         ]
     );
 }
 
 #[test]
 fn normalize_adds_missing_output_for_function_call_inserts_output() {
-    let items = vec![ResponseItem::FunctionCall {
-        id: None,
-        name: "do_it".to_string(),
-        arguments: "{}".to_string(),
-        call_id: "call-x".to_string(),
-    }];
+    let items = vec![ResponseItem::FunctionCall(
+        codex_protocol::models::FunctionCall {
+            id: None,
+            name: "do_it".to_string(),
+            arguments: "{}".to_string(),
+            call_id: "call-x".to_string(),
+        },
+    )];
     let mut h = create_history_with_items(items);
     h.normalize_history();
     assert_eq!(
         h.raw_items(),
         vec![
-            ResponseItem::FunctionCall {
+            ResponseItem::FunctionCall(codex_protocol::models::FunctionCall {
                 id: None,
                 name: "do_it".to_string(),
                 arguments: "{}".to_string(),
                 call_id: "call-x".to_string(),
-            },
-            ResponseItem::FunctionCallOutput {
+            }),
+            ResponseItem::FunctionCallOutput(codex_protocol::models::FunctionCallOutput {
                 call_id: "call-x".to_string(),
                 output: FunctionCallOutputPayload::from_text("aborted".to_string()),
-            },
+            }),
         ]
     );
 }
@@ -1020,13 +1045,15 @@ fn normalize_adds_missing_output_for_function_call_inserts_output() {
 #[test]
 #[should_panic]
 fn normalize_adds_missing_output_for_custom_tool_call_panics_in_debug() {
-    let items = vec![ResponseItem::CustomToolCall {
-        id: None,
-        status: None,
-        call_id: "tool-x".to_string(),
-        name: "custom".to_string(),
-        input: "{}".to_string(),
-    }];
+    let items = vec![ResponseItem::CustomToolCall(
+        codex_protocol::models::CustomToolCall {
+            id: None,
+            status: None,
+            call_id: "tool-x".to_string(),
+            name: "custom".to_string(),
+            input: "{}".to_string(),
+        },
+    )];
     let mut h = create_history_with_items(items);
     h.normalize_history();
 }
@@ -1035,18 +1062,20 @@ fn normalize_adds_missing_output_for_custom_tool_call_panics_in_debug() {
 #[test]
 #[should_panic]
 fn normalize_adds_missing_output_for_local_shell_call_with_id_panics_in_debug() {
-    let items = vec![ResponseItem::LocalShellCall {
-        id: None,
-        call_id: Some("shell-1".to_string()),
-        status: LocalShellStatus::Completed,
-        action: LocalShellAction::Exec(LocalShellExecAction {
-            command: vec!["echo".to_string(), "hi".to_string()],
-            timeout_ms: None,
-            working_directory: None,
-            env: None,
-            user: None,
-        }),
-    }];
+    let items = vec![ResponseItem::LocalShellCall(
+        codex_protocol::models::LocalShellCall {
+            id: None,
+            call_id: Some("shell-1".to_string()),
+            status: LocalShellStatus::Completed,
+            action: LocalShellAction::Exec(LocalShellExecAction {
+                command: vec!["echo".to_string(), "hi".to_string()],
+                timeout_ms: None,
+                working_directory: None,
+                env: None,
+                user: None,
+            }),
+        },
+    )];
     let mut h = create_history_with_items(items);
     h.normalize_history();
 }
@@ -1055,10 +1084,12 @@ fn normalize_adds_missing_output_for_local_shell_call_with_id_panics_in_debug()
 #[test]
 #[should_panic]
 fn normalize_removes_orphan_function_call_output_panics_in_debug() {
-    let items = vec![ResponseItem::FunctionCallOutput {
-        call_id: "orphan-1".to_string(),
-        output: FunctionCallOutputPayload::from_text("ok".to_string()),
-    }];
+    let items = vec![ResponseItem::FunctionCallOutput(
+        codex_protocol::models::FunctionCallOutput {
+            call_id: "orphan-1".to_string(),
+            output: FunctionCallOutputPayload::from_text("ok".to_string()),
+        },
+    )];
     let mut h = create_history_with_items(items);
     h.normalize_history();
 }
@@ -1067,10 +1098,12 @@ fn normalize_removes_orphan_function_call_output_panics_in_debug() {
 #[test]
 #[should_panic]
 fn normalize_removes_orphan_custom_tool_call_output_panics_in_debug() {
-    let items = vec![ResponseItem::CustomToolCallOutput {
-        call_id: "orphan-2".to_string(),
-        output: "ok".to_string(),
-    }];
+    let items = vec![ResponseItem::CustomToolCallOutput(
+        codex_protocol::models::CustomToolCallOutput {
+            call_id: "orphan-2".to_string(),
+            output: "ok".to_string(),
+        },
+    )];
     let mut h = create_history_with_items(items);
     h.normalize_history();
 }
@@ -1080,24 +1113,24 @@ fn normalize_removes_orphan_custom_tool_call_output_panics_in_debug() {
 #[should_panic]
 fn normalize_mixed_inserts_and_removals_panics_in_debug() {
     let items = vec![
-        ResponseItem::FunctionCall {
+        ResponseItem::FunctionCall(codex_protocol::models::FunctionCall {
             id: None,
             name: "f1".to_string(),
             arguments: "{}".to_string(),
             call_id: "c1".to_string(),
-        },
-        ResponseItem::FunctionCallOutput {
+        }),
+        ResponseItem::FunctionCallOutput(codex_protocol::models::FunctionCallOutput {
             call_id: "c2".to_string(),
             output: FunctionCallOutputPayload::from_text("ok".to_string()),
-        },
-        ResponseItem::CustomToolCall {
+        }),
+        ResponseItem::CustomToolCall(codex_protocol::models::CustomToolCall {
             id: None,
             status: None,
             call_id: "t1".to_string(),
             name: "tool".to_string(),
             input: "{}".to_string(),
-        },
-        ResponseItem::LocalShellCall {
+        }),
+        ResponseItem::LocalShellCall(codex_protocol::models::LocalShellCall {
             id: None,
             call_id: Some("s1".to_string()),
             status: LocalShellStatus::Completed,
@@ -1108,7 +1141,7 @@ fn normalize_mixed_inserts_and_removals_panics_in_debug() {
                 env: None,
                 user: None,
             }),
-        },
+        }),
     ];
     let mut h = create_history_with_items(items);
     h.normalize_history();

codex-rs/core/src/context_manager/mod.rs

@@ -1,3 +1,4 @@
+mod context_discoverable;
 mod history;
 mod normalize;
 

codex-rs/core/src/context_manager/normalize.rs

@@ -15,11 +15,15 @@ pub(crate) fn ensure_call_outputs_present(items: &mut Vec<ResponseItem>) {
 
     for (idx, item) in items.iter().enumerate() {
         match item {
-            ResponseItem::FunctionCall { call_id, .. } => {
+            ResponseItem::FunctionCall(codex_protocol::models::FunctionCall {
+                call_id, ..
+            }) => {
                 let has_output = items.iter().any(|i| match i {
-                    ResponseItem::FunctionCallOutput {
-                        call_id: existing, ..
-                    } => existing == call_id,
+                    ResponseItem::FunctionCallOutput(
+                        codex_protocol::models::FunctionCallOutput {
+                            call_id: existing, ..
+                        },
+                    ) => existing == call_id,
                     _ => false,
                 });
 
@@ -27,21 +31,28 @@ pub(crate) fn ensure_call_outputs_present(items: &mut Vec<ResponseItem>) {
                     info!("Function call output is missing for call id: {call_id}");
                     missing_outputs_to_insert.push((
                         idx,
-                        ResponseItem::FunctionCallOutput {
-                            call_id: call_id.clone(),
-                            output: FunctionCallOutputPayload {
-                                body: FunctionCallOutputBody::Text("aborted".to_string()),
-                                ..Default::default()
+                        ResponseItem::FunctionCallOutput(
+                            codex_protocol::models::FunctionCallOutput {
+                                call_id: call_id.clone(),
+                                output: FunctionCallOutputPayload {
+                                    body: FunctionCallOutputBody::Text("aborted".to_string()),
+                                    ..Default::default()
+                                },
                             },
-                        },
+                        ),
                     ));
                 }
             }
-            ResponseItem::CustomToolCall { call_id, .. } => {
+            ResponseItem::CustomToolCall(codex_protocol::models::CustomToolCall {
+                call_id,
+                ..
+            }) => {
                 let has_output = items.iter().any(|i| match i {
-                    ResponseItem::CustomToolCallOutput {
-                        call_id: existing, ..
-                    } => existing == call_id,
+                    ResponseItem::CustomToolCallOutput(
+                        codex_protocol::models::CustomToolCallOutput {
+                            call_id: existing, ..
+                        },
+                    ) => existing == call_id,
                     _ => false,
                 });
 
@@ -51,20 +62,27 @@ pub(crate) fn ensure_call_outputs_present(items: &mut Vec<ResponseItem>) {
                     ));
                     missing_outputs_to_insert.push((
                         idx,
-                        ResponseItem::CustomToolCallOutput {
-                            call_id: call_id.clone(),
-                            output: "aborted".to_string(),
-                        },
+                        ResponseItem::CustomToolCallOutput(
+                            codex_protocol::models::CustomToolCallOutput {
+                                call_id: call_id.clone(),
+                                output: "aborted".to_string(),
+                            },
+                        ),
                     ));
                 }
             }
             // LocalShellCall is represented in upstream streams by a FunctionCallOutput
-            ResponseItem::LocalShellCall { call_id, .. } => {
+            ResponseItem::LocalShellCall(codex_protocol::models::LocalShellCall {
+                call_id,
+                ..
+            }) => {
                 if let Some(call_id) = call_id.as_ref() {
                     let has_output = items.iter().any(|i| match i {
-                        ResponseItem::FunctionCallOutput {
-                            call_id: existing, ..
-                        } => existing == call_id,
+                        ResponseItem::FunctionCallOutput(
+                            codex_protocol::models::FunctionCallOutput {
+                                call_id: existing, ..
+                            },
+                        ) => existing == call_id,
                         _ => false,
                     });
 
@@ -74,13 +92,15 @@ pub(crate) fn ensure_call_outputs_present(items: &mut Vec<ResponseItem>) {
                         ));
                         missing_outputs_to_insert.push((
                             idx,
-                            ResponseItem::FunctionCallOutput {
-                                call_id: call_id.clone(),
-                                output: FunctionCallOutputPayload {
-                                    body: FunctionCallOutputBody::Text("aborted".to_string()),
-                                    ..Default::default()
+                            ResponseItem::FunctionCallOutput(
+                                codex_protocol::models::FunctionCallOutput {
+                                    call_id: call_id.clone(),
+                                    output: FunctionCallOutputPayload {
+                                        body: FunctionCallOutputBody::Text("aborted".to_string()),
+                                        ..Default::default()
+                                    },
                                 },
-                            },
+                            ),
                         ));
                     }
                 }
@@ -99,7 +119,9 @@ pub(crate) fn remove_orphan_outputs(items: &mut Vec<ResponseItem>) {
     let function_call_ids: HashSet<String> = items
         .iter()
         .filter_map(|i| match i {
-            ResponseItem::FunctionCall { call_id, .. } => Some(call_id.clone()),
+            ResponseItem::FunctionCall(codex_protocol::models::FunctionCall {
+                call_id, ..
+            }) => Some(call_id.clone()),
             _ => None,
         })
         .collect();
@@ -107,10 +129,10 @@ pub(crate) fn remove_orphan_outputs(items: &mut Vec<ResponseItem>) {
     let local_shell_call_ids: HashSet<String> = items
         .iter()
         .filter_map(|i| match i {
-            ResponseItem::LocalShellCall {
+            ResponseItem::LocalShellCall(codex_protocol::models::LocalShellCall {
                 call_id: Some(call_id),
                 ..
-            } => Some(call_id.clone()),
+            }) => Some(call_id.clone()),
             _ => None,
         })
         .collect();
@@ -118,13 +140,19 @@ pub(crate) fn remove_orphan_outputs(items: &mut Vec<ResponseItem>) {
     let custom_tool_call_ids: HashSet<String> = items
         .iter()
         .filter_map(|i| match i {
-            ResponseItem::CustomToolCall { call_id, .. } => Some(call_id.clone()),
+            ResponseItem::CustomToolCall(codex_protocol::models::CustomToolCall {
+                call_id,
+                ..
+            }) => Some(call_id.clone()),
             _ => None,
         })
         .collect();
 
     items.retain(|item| match item {
-        ResponseItem::FunctionCallOutput { call_id, .. } => {
+        ResponseItem::FunctionCallOutput(codex_protocol::models::FunctionCallOutput {
+            call_id,
+            ..
+        }) => {
             let has_match =
                 function_call_ids.contains(call_id) || local_shell_call_ids.contains(call_id);
             if !has_match {
@@ -134,7 +162,10 @@ pub(crate) fn remove_orphan_outputs(items: &mut Vec<ResponseItem>) {
             }
             has_match
         }
-        ResponseItem::CustomToolCallOutput { call_id, .. } => {
+        ResponseItem::CustomToolCallOutput(codex_protocol::models::CustomToolCallOutput {
+            call_id,
+            ..
+        }) => {
             let has_match = custom_tool_call_ids.contains(call_id);
             if !has_match {
                 error_or_panic(format!(
@@ -149,53 +180,53 @@ pub(crate) fn remove_orphan_outputs(items: &mut Vec<ResponseItem>) {
 
 pub(crate) fn remove_corresponding_for(items: &mut Vec<ResponseItem>, item: &ResponseItem) {
     match item {
-        ResponseItem::FunctionCall { call_id, .. } => {
+        ResponseItem::FunctionCall(codex_protocol::models::FunctionCall { call_id, .. }) => {
             remove_first_matching(items, |i| {
                 matches!(
                     i,
-                    ResponseItem::FunctionCallOutput {
+                    ResponseItem::FunctionCallOutput(codex_protocol::models::FunctionCallOutput {
                         call_id: existing, ..
-                    } if existing == call_id
+                    }) if existing == call_id
                 )
             });
         }
-        ResponseItem::FunctionCallOutput { call_id, .. } => {
+        ResponseItem::FunctionCallOutput(codex_protocol::models::FunctionCallOutput { call_id, .. }) => {
             if let Some(pos) = items.iter().position(|i| {
-                matches!(i, ResponseItem::FunctionCall { call_id: existing, .. } if existing == call_id)
+                matches!(i, ResponseItem::FunctionCall(codex_protocol::models::FunctionCall { call_id: existing, .. }) if existing == call_id)
             }) {
                 items.remove(pos);
             } else if let Some(pos) = items.iter().position(|i| {
-                matches!(i, ResponseItem::LocalShellCall { call_id: Some(existing), .. } if existing == call_id)
+                matches!(i, ResponseItem::LocalShellCall(codex_protocol::models::LocalShellCall { call_id: Some(existing), .. }) if existing == call_id)
             }) {
                 items.remove(pos);
             }
         }
-        ResponseItem::CustomToolCall { call_id, .. } => {
+        ResponseItem::CustomToolCall(codex_protocol::models::CustomToolCall { call_id, .. }) => {
             remove_first_matching(items, |i| {
                 matches!(
                     i,
-                    ResponseItem::CustomToolCallOutput {
+                    ResponseItem::CustomToolCallOutput(codex_protocol::models::CustomToolCallOutput {
                         call_id: existing, ..
-                    } if existing == call_id
+                    }) if existing == call_id
                 )
             });
         }
-        ResponseItem::CustomToolCallOutput { call_id, .. } => {
+        ResponseItem::CustomToolCallOutput(codex_protocol::models::CustomToolCallOutput { call_id, .. }) => {
             remove_first_matching(
                 items,
-                |i| matches!(i, ResponseItem::CustomToolCall { call_id: existing, .. } if existing == call_id),
+                |i| matches!(i, ResponseItem::CustomToolCall(codex_protocol::models::CustomToolCall { call_id: existing, .. }) if existing == call_id),
             );
         }
-        ResponseItem::LocalShellCall {
+        ResponseItem::LocalShellCall(codex_protocol::models::LocalShellCall {
             call_id: Some(call_id),
             ..
-        } => {
+        }) => {
             remove_first_matching(items, |i| {
                 matches!(
                     i,
-                    ResponseItem::FunctionCallOutput {
+                    ResponseItem::FunctionCallOutput(codex_protocol::models::FunctionCallOutput {
                         call_id: existing, ..
-                    } if existing == call_id
+                    }) if existing == call_id
                 )
             });
         }

codex-rs/core/src/environment_context.rs

@@ -125,7 +125,7 @@ impl EnvironmentContext {
 
 impl From<EnvironmentContext> for ResponseItem {
     fn from(ec: EnvironmentContext) -> Self {
-        ResponseItem::Message {
+        ResponseItem::Message(codex_protocol::models::Message {
             id: None,
             role: "user".to_string(),
             content: vec![ContentItem::InputText {
@@ -133,7 +133,7 @@ impl From<EnvironmentContext> for ResponseItem {
             }],
             end_turn: None,
             phase: None,
-        }
+        })
     }
 }
 

codex-rs/core/src/event_mapping.rs

@@ -95,13 +95,13 @@ fn parse_agent_message(
 
 pub fn parse_turn_item(item: &ResponseItem) -> Option<TurnItem> {
     match item {
-        ResponseItem::Message {
+        ResponseItem::Message(codex_protocol::models::Message {
             role,
             content,
             id,
             phase,
             ..
-        } => match role.as_str() {
+        }) => match role.as_str() {
             "user" => parse_user_message(content).map(TurnItem::UserMessage),
             "assistant" => Some(TurnItem::AgentMessage(parse_agent_message(
                 id.as_ref(),
@@ -111,12 +111,12 @@ pub fn parse_turn_item(item: &ResponseItem) -> Option<TurnItem> {
             "system" => None,
             _ => None,
         },
-        ResponseItem::Reasoning {
+        ResponseItem::Reasoning(codex_protocol::models::Reasoning {
             id,
             summary,
             content,
             ..
-        } => {
+        }) => {
             let summary_text = summary
                 .iter()
                 .map(|entry| match entry {
@@ -138,7 +138,9 @@ pub fn parse_turn_item(item: &ResponseItem) -> Option<TurnItem> {
                 raw_content,
             }))
         }
-        ResponseItem::WebSearchCall { id, action, .. } => {
+        ResponseItem::WebSearchCall(codex_protocol::models::WebSearchCall {
+            id, action, ..
+        }) => {
             let (action, query) = match action {
                 Some(action) => (action.clone(), web_search_action_detail(action)),
                 None => (WebSearchAction::Other, String::new()),
@@ -172,7 +174,7 @@ mod tests {
         let img1 = "https://example.com/one.png".to_string();
         let img2 = "https://example.com/two.jpg".to_string();
 
-        let item = ResponseItem::Message {
+        let item = ResponseItem::Message(codex_protocol::models::Message {
             id: None,
             role: "user".to_string(),
             content: vec![
@@ -188,7 +190,7 @@ mod tests {
             ],
             end_turn: None,
             phase: None,
-        };
+        });
 
         let turn_item = parse_turn_item(&item).expect("expected user message turn item");
 
@@ -214,7 +216,7 @@ mod tests {
         let label = codex_protocol::models::local_image_open_tag_text(1);
         let user_text = "Please review this image.".to_string();
 
-        let item = ResponseItem::Message {
+        let item = ResponseItem::Message(codex_protocol::models::Message {
             id: None,
             role: "user".to_string(),
             content: vec![
@@ -231,7 +233,7 @@ mod tests {
             ],
             end_turn: None,
             phase: None,
-        };
+        });
 
         let turn_item = parse_turn_item(&item).expect("expected user message turn item");
 
@@ -256,7 +258,7 @@ mod tests {
         let label = codex_protocol::models::image_open_tag_text();
         let user_text = "Please review this image.".to_string();
 
-        let item = ResponseItem::Message {
+        let item = ResponseItem::Message(codex_protocol::models::Message {
             id: None,
             role: "user".to_string(),
             content: vec![
@@ -273,7 +275,7 @@ mod tests {
             ],
             end_turn: None,
             phase: None,
-        };
+        });
 
         let turn_item = parse_turn_item(&item).expect("expected user message turn item");
 
@@ -295,7 +297,7 @@ mod tests {
     #[test]
     fn skips_user_instructions_and_env() {
         let items = vec![
-            ResponseItem::Message {
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "user".to_string(),
                 content: vec![ContentItem::InputText {
@@ -303,8 +305,8 @@ mod tests {
                 }],
                 end_turn: None,
             phase: None,
-            },
-            ResponseItem::Message {
+            }),
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "user".to_string(),
                 content: vec![ContentItem::InputText {
@@ -312,8 +314,8 @@ mod tests {
                 }],
                 end_turn: None,
             phase: None,
-            },
-            ResponseItem::Message {
+            }),
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "user".to_string(),
                 content: vec![ContentItem::InputText {
@@ -321,8 +323,8 @@ mod tests {
                 }],
                 end_turn: None,
             phase: None,
-            },
-            ResponseItem::Message {
+            }),
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "user".to_string(),
                 content: vec![ContentItem::InputText {
@@ -331,8 +333,8 @@ mod tests {
                 }],
                 end_turn: None,
             phase: None,
-            },
-            ResponseItem::Message {
+            }),
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "user".to_string(),
                 content: vec![ContentItem::InputText {
@@ -340,7 +342,7 @@ mod tests {
                 }],
                 end_turn: None,
             phase: None,
-            },
+            }),
         ];
 
         for item in items {
@@ -351,7 +353,7 @@ mod tests {
 
     #[test]
     fn parses_agent_message() {
-        let item = ResponseItem::Message {
+        let item = ResponseItem::Message(codex_protocol::models::Message {
             id: Some("msg-1".to_string()),
             role: "assistant".to_string(),
             content: vec![ContentItem::OutputText {
@@ -359,7 +361,7 @@ mod tests {
             }],
             end_turn: None,
             phase: None,
-        };
+        });
 
         let turn_item = parse_turn_item(&item).expect("expected agent message turn item");
 
@@ -376,7 +378,7 @@ mod tests {
 
     #[test]
     fn parses_reasoning_summary_and_raw_content() {
-        let item = ResponseItem::Reasoning {
+        let item = ResponseItem::Reasoning(codex_protocol::models::Reasoning {
             id: "reasoning_1".to_string(),
             summary: vec![
                 ReasoningItemReasoningSummary::SummaryText {
@@ -390,7 +392,7 @@ mod tests {
                 text: "raw details".to_string(),
             }]),
             encrypted_content: None,
-        };
+        });
 
         let turn_item = parse_turn_item(&item).expect("expected reasoning turn item");
 
@@ -408,7 +410,7 @@ mod tests {
 
     #[test]
     fn parses_reasoning_including_raw_content() {
-        let item = ResponseItem::Reasoning {
+        let item = ResponseItem::Reasoning(codex_protocol::models::Reasoning {
             id: "reasoning_2".to_string(),
             summary: vec![ReasoningItemReasoningSummary::SummaryText {
                 text: "Summarized step".to_string(),
@@ -422,7 +424,7 @@ mod tests {
                 },
             ]),
             encrypted_content: None,
-        };
+        });
 
         let turn_item = parse_turn_item(&item).expect("expected reasoning turn item");
 
@@ -440,14 +442,14 @@ mod tests {
 
     #[test]
     fn parses_web_search_call() {
-        let item = ResponseItem::WebSearchCall {
+        let item = ResponseItem::WebSearchCall(codex_protocol::models::WebSearchCall {
             id: Some("ws_1".to_string()),
             status: Some("completed".to_string()),
             action: Some(WebSearchAction::Search {
                 query: Some("weather".to_string()),
                 queries: None,
             }),
-        };
+        });
 
         let turn_item = parse_turn_item(&item).expect("expected web search turn item");
 
@@ -469,13 +471,13 @@ mod tests {
 
     #[test]
     fn parses_web_search_open_page_call() {
-        let item = ResponseItem::WebSearchCall {
+        let item = ResponseItem::WebSearchCall(codex_protocol::models::WebSearchCall {
             id: Some("ws_open".to_string()),
             status: Some("completed".to_string()),
             action: Some(WebSearchAction::OpenPage {
                 url: Some("https://example.com".to_string()),
             }),
-        };
+        });
 
         let turn_item = parse_turn_item(&item).expect("expected web search turn item");
 
@@ -496,14 +498,14 @@ mod tests {
 
     #[test]
     fn parses_web_search_find_in_page_call() {
-        let item = ResponseItem::WebSearchCall {
+        let item = ResponseItem::WebSearchCall(codex_protocol::models::WebSearchCall {
             id: Some("ws_find".to_string()),
             status: Some("completed".to_string()),
             action: Some(WebSearchAction::FindInPage {
                 url: Some("https://example.com".to_string()),
                 pattern: Some("needle".to_string()),
             }),
-        };
+        });
 
         let turn_item = parse_turn_item(&item).expect("expected web search turn item");
 
@@ -525,11 +527,11 @@ mod tests {
 
     #[test]
     fn parses_partial_web_search_call_without_action_as_other() {
-        let item = ResponseItem::WebSearchCall {
+        let item = ResponseItem::WebSearchCall(codex_protocol::models::WebSearchCall {
             id: Some("ws_partial".to_string()),
             status: Some("in_progress".to_string()),
             action: None,
-        };
+        });
 
         let turn_item = parse_turn_item(&item).expect("expected web search turn item");
         match turn_item {

codex-rs/core/src/instructions/user_instructions.rs

@@ -28,7 +28,7 @@ impl UserInstructions {
 
 impl From<UserInstructions> for ResponseItem {
     fn from(ui: UserInstructions) -> Self {
-        ResponseItem::Message {
+        ResponseItem::Message(codex_protocol::models::Message {
             id: None,
             role: "user".to_string(),
             content: vec![ContentItem::InputText {
@@ -40,7 +40,7 @@ impl From<UserInstructions> for ResponseItem {
             }],
             end_turn: None,
             phase: None,
-        }
+        })
     }
 }
 
@@ -64,7 +64,7 @@ impl SkillInstructions {
 
 impl From<SkillInstructions> for ResponseItem {
     fn from(si: SkillInstructions) -> Self {
-        ResponseItem::Message {
+        ResponseItem::Message(codex_protocol::models::Message {
             id: None,
             role: "user".to_string(),
             content: vec![ContentItem::InputText {
@@ -75,7 +75,7 @@ impl From<SkillInstructions> for ResponseItem {
             }],
             end_turn: None,
             phase: None,
-        }
+        })
     }
 }
 
@@ -92,7 +92,9 @@ mod tests {
         };
         let response_item: ResponseItem = user_instructions.into();
 
-        let ResponseItem::Message { role, content, .. } = response_item else {
+        let ResponseItem::Message(codex_protocol::models::Message { role, content, .. }) =
+            response_item
+        else {
             panic!("expected ResponseItem::Message");
         };
 
@@ -136,7 +138,9 @@ mod tests {
         };
         let response_item: ResponseItem = skill_instructions.into();
 
-        let ResponseItem::Message { role, content, .. } = response_item else {
+        let ResponseItem::Message(codex_protocol::models::Message { role, content, .. }) =
+            response_item
+        else {
             panic!("expected ResponseItem::Message");
         };
 

codex-rs/core/src/rollout/tests.rs

@@ -1141,15 +1141,17 @@ async fn test_updated_at_uses_file_mtime() -> Result<()> {
     for idx in 0..total_messages {
         let response_line = RolloutLine {
             timestamp: format!("{ts}-{idx:02}"),
-            item: RolloutItem::ResponseItem(ResponseItem::Message {
-                id: None,
-                role: "assistant".into(),
-                content: vec![ContentItem::OutputText {
-                    text: format!("reply-{idx}"),
-                }],
-                end_turn: None,
-                phase: None,
-            }),
+            item: RolloutItem::ResponseItem(ResponseItem::Message(
+                codex_protocol::models::Message {
+                    id: None,
+                    role: "assistant".into(),
+                    content: vec![ContentItem::OutputText {
+                        text: format!("reply-{idx}"),
+                    }],
+                    end_turn: None,
+                    phase: None,
+                },
+            )),
         };
         writeln!(file, "{}", serde_json::to_string(&response_line)?)?;
     }

codex-rs/core/src/rollout/truncation.rs

@@ -11,7 +11,7 @@ use codex_protocol::protocol::RolloutItem;
 
 /// Return the indices of user message boundaries in a rollout.
 ///
-/// A user message boundary is a `RolloutItem::ResponseItem(ResponseItem::Message { .. })`
+/// A user message boundary is a `RolloutItem::ResponseItem(ResponseItem::Message(codex_protocol::models::Message { .. }))`
 /// whose parsed turn item is `TurnItem::UserMessage`.
 ///
 /// Rollouts can contain `ThreadRolledBack` markers. Those markers indicate that the
@@ -21,11 +21,12 @@ pub(crate) fn user_message_positions_in_rollout(items: &[RolloutItem]) -> Vec<us
     let mut user_positions = Vec::new();
     for (idx, item) in items.iter().enumerate() {
         match item {
-            RolloutItem::ResponseItem(item @ ResponseItem::Message { .. })
-                if matches!(
-                    event_mapping::parse_turn_item(item),
-                    Some(TurnItem::UserMessage(_))
-                ) =>
+            RolloutItem::ResponseItem(
+                item @ ResponseItem::Message(codex_protocol::models::Message { .. }),
+            ) if matches!(
+                event_mapping::parse_turn_item(item),
+                Some(TurnItem::UserMessage(_))
+            ) =>
             {
                 user_positions.push(idx);
             }
@@ -79,7 +80,7 @@ mod tests {
     use pretty_assertions::assert_eq;
 
     fn user_msg(text: &str) -> ResponseItem {
-        ResponseItem::Message {
+        ResponseItem::Message(codex_protocol::models::Message {
             id: None,
             role: "user".to_string(),
             content: vec![ContentItem::OutputText {
@@ -87,11 +88,11 @@ mod tests {
             }],
             end_turn: None,
             phase: None,
-        }
+        })
     }
 
     fn assistant_msg(text: &str) -> ResponseItem {
-        ResponseItem::Message {
+        ResponseItem::Message(codex_protocol::models::Message {
             id: None,
             role: "assistant".to_string(),
             content: vec![ContentItem::OutputText {
@@ -99,7 +100,7 @@ mod tests {
             }],
             end_turn: None,
             phase: None,
-        }
+        })
     }
 
     #[test]
@@ -110,20 +111,20 @@ mod tests {
             assistant_msg("a2"),
             user_msg("u2"),
             assistant_msg("a3"),
-            ResponseItem::Reasoning {
+            ResponseItem::Reasoning(codex_protocol::models::Reasoning {
                 id: "r1".to_string(),
                 summary: vec![ReasoningItemReasoningSummary::SummaryText {
                     text: "s".to_string(),
                 }],
                 content: None,
                 encrypted_content: None,
-            },
-            ResponseItem::FunctionCall {
+            }),
+            ResponseItem::FunctionCall(codex_protocol::models::FunctionCall {
                 id: None,
                 name: "tool".to_string(),
                 arguments: "{}".to_string(),
                 call_id: "c1".to_string(),
-            },
+            }),
             assistant_msg("a4"),
         ];
 

codex-rs/core/src/stream_events_utils.rs

@@ -165,9 +165,9 @@ pub(crate) async fn handle_non_tool_response_item(
     debug!(?item, "Output item");
 
     match item {
-        ResponseItem::Message { .. }
-        | ResponseItem::Reasoning { .. }
-        | ResponseItem::WebSearchCall { .. } => {
+        ResponseItem::Message(codex_protocol::models::Message { .. })
+        | ResponseItem::Reasoning(codex_protocol::models::Reasoning { .. })
+        | ResponseItem::WebSearchCall(codex_protocol::models::WebSearchCall { .. }) => {
             let mut turn_item = parse_turn_item(item)?;
             if plan_mode && let TurnItem::AgentMessage(agent_message) = &mut turn_item {
                 let combined = agent_message
@@ -183,7 +183,10 @@ pub(crate) async fn handle_non_tool_response_item(
             }
             Some(turn_item)
         }
-        ResponseItem::FunctionCallOutput { .. } | ResponseItem::CustomToolCallOutput { .. } => {
+        ResponseItem::FunctionCallOutput(codex_protocol::models::FunctionCallOutput { .. })
+        | ResponseItem::CustomToolCallOutput(codex_protocol::models::CustomToolCallOutput {
+            ..
+        }) => {
             debug!("unexpected tool output from stream");
             None
         }
@@ -195,7 +198,7 @@ pub(crate) fn last_assistant_message_from_item(
     item: &ResponseItem,
     plan_mode: bool,
 ) -> Option<String> {
-    if let ResponseItem::Message { role, content, .. } = item
+    if let ResponseItem::Message(codex_protocol::models::Message { role, content, .. }) = item
         && role == "assistant"
     {
         let combined = content
@@ -220,18 +223,18 @@ pub(crate) fn last_assistant_message_from_item(
 
 pub(crate) fn response_input_to_response_item(input: &ResponseInputItem) -> Option<ResponseItem> {
     match input {
-        ResponseInputItem::FunctionCallOutput { call_id, output } => {
-            Some(ResponseItem::FunctionCallOutput {
+        ResponseInputItem::FunctionCallOutput { call_id, output } => Some(
+            ResponseItem::FunctionCallOutput(codex_protocol::models::FunctionCallOutput {
                 call_id: call_id.clone(),
                 output: output.clone(),
-            })
-        }
-        ResponseInputItem::CustomToolCallOutput { call_id, output } => {
-            Some(ResponseItem::CustomToolCallOutput {
+            }),
+        ),
+        ResponseInputItem::CustomToolCallOutput { call_id, output } => Some(
+            ResponseItem::CustomToolCallOutput(codex_protocol::models::CustomToolCallOutput {
                 call_id: call_id.clone(),
                 output: output.clone(),
-            })
-        }
+            }),
+        ),
         ResponseInputItem::McpToolCallOutput { call_id, result } => {
             let output = match result {
                 Ok(call_tool_result) => FunctionCallOutputPayload::from(call_tool_result),
@@ -240,10 +243,12 @@ pub(crate) fn response_input_to_response_item(input: &ResponseInputItem) -> Opti
                     success: Some(false),
                 },
             };
-            Some(ResponseItem::FunctionCallOutput {
-                call_id: call_id.clone(),
-                output,
-            })
+            Some(ResponseItem::FunctionCallOutput(
+                codex_protocol::models::FunctionCallOutput {
+                    call_id: call_id.clone(),
+                    output,
+                },
+            ))
         }
         _ => None,
     }

codex-rs/core/src/tasks/ghost_snapshot.rs

@@ -106,9 +106,9 @@ impl SessionTask for GhostSnapshotTask {
                             }
                             session
                                 .session
-                                .record_conversation_items(&ctx, &[ResponseItem::GhostSnapshot {
+                                .record_conversation_items(&ctx, &[ResponseItem::GhostSnapshot(codex_protocol::models::GhostSnapshot {
                                     ghost_commit: ghost_commit.clone(),
-                                }])
+                                })])
                                 .await;
                             info!("ghost commit captured: {}", ghost_commit.id());
                         }

codex-rs/core/src/tasks/mod.rs

@@ -270,7 +270,7 @@ impl Session {
             .await;
 
         if reason == TurnAbortReason::Interrupted {
-            let marker = ResponseItem::Message {
+            let marker = ResponseItem::Message(codex_protocol::models::Message {
                 id: None,
                 role: "user".to_string(),
                 content: vec![ContentItem::InputText {
@@ -280,7 +280,7 @@ impl Session {
                 }],
                 end_turn: None,
                 phase: None,
-            };
+            });
             self.record_into_history(std::slice::from_ref(&marker), task.turn_context.as_ref())
                 .await;
             self.persist_rollout_items(&[RolloutItem::ResponseItem(marker)])

codex-rs/core/src/tasks/review.rs

@@ -231,13 +231,13 @@ pub(crate) async fn exit_review_mode(
     session
         .record_conversation_items(
             &ctx,
-            &[ResponseItem::Message {
+            &[ResponseItem::Message(codex_protocol::models::Message {
                 id: Some(REVIEW_USER_MESSAGE_ID.to_string()),
                 role: "user".to_string(),
                 content: vec![ContentItem::InputText { text: user_message }],
                 end_turn: None,
                 phase: None,
-            }],
+            })],
         )
         .await;
 
@@ -250,7 +250,7 @@ pub(crate) async fn exit_review_mode(
     session
         .record_response_item_and_emit_turn_item(
             ctx.as_ref(),
-            ResponseItem::Message {
+            ResponseItem::Message(codex_protocol::models::Message {
                 id: Some(REVIEW_ASSISTANT_MESSAGE_ID.to_string()),
                 role: "assistant".to_string(),
                 content: vec![ContentItem::OutputText {
@@ -258,7 +258,7 @@ pub(crate) async fn exit_review_mode(
                 }],
                 end_turn: None,
                 phase: None,
-            },
+            }),
         )
         .await;
 

codex-rs/core/src/tasks/undo.rs

@@ -77,9 +77,9 @@ impl SessionTask for UndoTask {
                 .enumerate()
                 .rev()
                 .find_map(|(idx, item)| match item {
-                    ResponseItem::GhostSnapshot { ghost_commit } => {
-                        Some((idx, ghost_commit.clone()))
-                    }
+                    ResponseItem::GhostSnapshot(codex_protocol::models::GhostSnapshot {
+                        ghost_commit,
+                    }) => Some((idx, ghost_commit.clone())),
                     _ => None,
                 })
         else {

codex-rs/core/src/tasks/user_shell.rs

@@ -298,7 +298,9 @@ async fn persist_user_shell_output(
     }
 
     let response_input_item = match output_item {
-        ResponseItem::Message { role, content, .. } => ResponseInputItem::Message { role, content },
+        ResponseItem::Message(codex_protocol::models::Message { role, content, .. }) => {
+            ResponseInputItem::Message { role, content }
+        }
         _ => unreachable!("user shell command output record should always be a message"),
     };
 

codex-rs/core/src/thread_manager.rs

@@ -530,7 +530,7 @@ mod tests {
     use pretty_assertions::assert_eq;
 
     fn user_msg(text: &str) -> ResponseItem {
-        ResponseItem::Message {
+        ResponseItem::Message(codex_protocol::models::Message {
             id: None,
             role: "user".to_string(),
             content: vec![ContentItem::OutputText {
@@ -538,10 +538,10 @@ mod tests {
             }],
             end_turn: None,
             phase: None,
-        }
+        })
     }
     fn assistant_msg(text: &str) -> ResponseItem {
-        ResponseItem::Message {
+        ResponseItem::Message(codex_protocol::models::Message {
             id: None,
             role: "assistant".to_string(),
             content: vec![ContentItem::OutputText {
@@ -549,7 +549,7 @@ mod tests {
             }],
             end_turn: None,
             phase: None,
-        }
+        })
     }
 
     #[test]
@@ -560,20 +560,20 @@ mod tests {
             assistant_msg("a2"),
             user_msg("u2"),
             assistant_msg("a3"),
-            ResponseItem::Reasoning {
+            ResponseItem::Reasoning(codex_protocol::models::Reasoning {
                 id: "r1".to_string(),
                 summary: vec![ReasoningItemReasoningSummary::SummaryText {
                     text: "s".to_string(),
                 }],
                 content: None,
                 encrypted_content: None,
-            },
-            ResponseItem::FunctionCall {
+            }),
+            ResponseItem::FunctionCall(codex_protocol::models::FunctionCall {
                 id: None,
                 call_id: "c1".to_string(),
                 name: "tool".to_string(),
                 arguments: "{}".to_string(),
-            },
+            }),
             assistant_msg("a4"),
         ];
 

codex-rs/core/src/tools/handlers/collab.rs

@@ -1150,15 +1150,17 @@ mod tests {
         let thread = manager
             .resume_thread_with_history(
                 config,
-                InitialHistory::Forked(vec![RolloutItem::ResponseItem(ResponseItem::Message {
-                    id: None,
-                    role: "user".to_string(),
-                    content: vec![ContentItem::InputText {
-                        text: "materialized".to_string(),
-                    }],
-                    end_turn: None,
-                    phase: None,
-                })]),
+                InitialHistory::Forked(vec![RolloutItem::ResponseItem(ResponseItem::Message(
+                    codex_protocol::models::Message {
+                        id: None,
+                        role: "user".to_string(),
+                        content: vec![ContentItem::InputText {
+                            text: "materialized".to_string(),
+                        }],
+                        end_turn: None,
+                        phase: None,
+                    },
+                ))]),
                 AuthManager::from_auth_for_testing(CodexAuth::from_api_key("dummy")),
             )
             .await

codex-rs/core/src/tools/router.rs

@@ -65,12 +65,12 @@ impl ToolRouter {
         item: ResponseItem,
     ) -> Result<Option<ToolCall>, FunctionCallError> {
         match item {
-            ResponseItem::FunctionCall {
+            ResponseItem::FunctionCall(codex_protocol::models::FunctionCall {
                 name,
                 arguments,
                 call_id,
                 ..
-            } => {
+            }) => {
                 if let Some((server, tool)) = session.parse_mcp_tool_name(&name).await {
                     Ok(Some(ToolCall {
                         tool_name: name,
@@ -89,22 +89,22 @@ impl ToolRouter {
                     }))
                 }
             }
-            ResponseItem::CustomToolCall {
+            ResponseItem::CustomToolCall(codex_protocol::models::CustomToolCall {
                 name,
                 input,
                 call_id,
                 ..
-            } => Ok(Some(ToolCall {
+            }) => Ok(Some(ToolCall {
                 tool_name: name,
                 call_id,
                 payload: ToolPayload::Custom { input },
             })),
-            ResponseItem::LocalShellCall {
+            ResponseItem::LocalShellCall(codex_protocol::models::LocalShellCall {
                 id,
                 call_id,
                 action,
                 ..
-            } => {
+            }) => {
                 let call_id = call_id
                     .or(id)
                     .ok_or(FunctionCallError::MissingLocalShellCallId)?;

codex-rs/core/src/user_shell_command.rs

@@ -56,7 +56,7 @@ pub fn user_shell_command_record_item(
     exec_output: &ExecToolCallOutput,
     turn_context: &TurnContext,
 ) -> ResponseItem {
-    ResponseItem::Message {
+    ResponseItem::Message(codex_protocol::models::Message {
         id: None,
         role: "user".to_string(),
         content: vec![ContentItem::InputText {
@@ -64,7 +64,7 @@ pub fn user_shell_command_record_item(
         }],
         end_turn: None,
         phase: None,
-    }
+    })
 }
 
 #[cfg(test)]
@@ -94,7 +94,7 @@ mod tests {
         };
         let (_, turn_context) = make_session_and_context().await;
         let item = user_shell_command_record_item("echo hi", &exec_output, &turn_context);
-        let ResponseItem::Message { content, .. } = item else {
+        let ResponseItem::Message(codex_protocol::models::Message { content, .. }) = item else {
             panic!("expected message");
         };
         let [ContentItem::InputText { text }] = content.as_slice() else {

codex-rs/core/tests/responses_headers.rs

@@ -101,7 +101,7 @@ async fn responses_stream_includes_subagent_header_on_review() {
     let mut client_session = client.new_session();
 
     let mut prompt = Prompt::default();
-    prompt.input = vec![ResponseItem::Message {
+    prompt.input = vec![ResponseItem::Message(codex_protocol::models::Message {
         id: None,
         role: "user".into(),
         content: vec![ContentItem::InputText {
@@ -109,7 +109,7 @@ async fn responses_stream_includes_subagent_header_on_review() {
         }],
         end_turn: None,
         phase: None,
-    }];
+    })];
 
     let mut stream = client_session
         .stream(&prompt, &model_info, &otel_manager, effort, summary, None)
@@ -205,7 +205,7 @@ async fn responses_stream_includes_subagent_header_on_other() {
     let mut client_session = client.new_session();
 
     let mut prompt = Prompt::default();
-    prompt.input = vec![ResponseItem::Message {
+    prompt.input = vec![ResponseItem::Message(codex_protocol::models::Message {
         id: None,
         role: "user".into(),
         content: vec![ContentItem::InputText {
@@ -213,7 +213,7 @@ async fn responses_stream_includes_subagent_header_on_other() {
         }],
         end_turn: None,
         phase: None,
-    }];
+    })];
 
     let mut stream = client_session
         .stream(&prompt, &model_info, &otel_manager, effort, summary, None)
@@ -308,7 +308,7 @@ async fn responses_respects_model_info_overrides_from_config() {
     let mut client_session = client.new_session();
 
     let mut prompt = Prompt::default();
-    prompt.input = vec![ResponseItem::Message {
+    prompt.input = vec![ResponseItem::Message(codex_protocol::models::Message {
         id: None,
         role: "user".into(),
         content: vec![ContentItem::InputText {
@@ -316,7 +316,7 @@ async fn responses_respects_model_info_overrides_from_config() {
         }],
         end_turn: None,
         phase: None,
-    }];
+    })];
 
     let mut stream = client_session
         .stream(&prompt, &model_info, &otel_manager, effort, summary, None)

codex-rs/core/tests/suite/client.rs

@@ -187,15 +187,16 @@ async fn resume_includes_initial_messages_and_sends_prior_items() {
     .unwrap();
 
     // Prior item: user message (should be delivered)
-    let prior_user = codex_protocol::models::ResponseItem::Message {
-        id: None,
-        role: "user".to_string(),
-        content: vec![codex_protocol::models::ContentItem::InputText {
-            text: "resumed user message".to_string(),
-        }],
-        end_turn: None,
-        phase: None,
-    };
+    let prior_user =
+        codex_protocol::models::ResponseItem::Message(codex_protocol::models::Message {
+            id: None,
+            role: "user".to_string(),
+            content: vec![codex_protocol::models::ContentItem::InputText {
+                text: "resumed user message".to_string(),
+            }],
+            end_turn: None,
+            phase: None,
+        });
     let prior_user_json = serde_json::to_value(&prior_user).unwrap();
     writeln!(
         f,
@@ -209,15 +210,16 @@ async fn resume_includes_initial_messages_and_sends_prior_items() {
     .unwrap();
 
     // Prior item: system message (excluded from API history)
-    let prior_system = codex_protocol::models::ResponseItem::Message {
-        id: None,
-        role: "system".to_string(),
-        content: vec![codex_protocol::models::ContentItem::OutputText {
-            text: "resumed system instruction".to_string(),
-        }],
-        end_turn: None,
-        phase: None,
-    };
+    let prior_system =
+        codex_protocol::models::ResponseItem::Message(codex_protocol::models::Message {
+            id: None,
+            role: "system".to_string(),
+            content: vec![codex_protocol::models::ContentItem::OutputText {
+                text: "resumed system instruction".to_string(),
+            }],
+            end_turn: None,
+            phase: None,
+        });
     let prior_system_json = serde_json::to_value(&prior_system).unwrap();
     writeln!(
         f,
@@ -231,15 +233,16 @@ async fn resume_includes_initial_messages_and_sends_prior_items() {
     .unwrap();
 
     // Prior item: assistant message
-    let prior_item = codex_protocol::models::ResponseItem::Message {
-        id: None,
-        role: "assistant".to_string(),
-        content: vec![codex_protocol::models::ContentItem::OutputText {
-            text: "resumed assistant message".to_string(),
-        }],
-        end_turn: None,
-        phase: Some(MessagePhase::Commentary),
-    };
+    let prior_item =
+        codex_protocol::models::ResponseItem::Message(codex_protocol::models::Message {
+            id: None,
+            role: "assistant".to_string(),
+            content: vec![codex_protocol::models::ContentItem::OutputText {
+                text: "resumed assistant message".to_string(),
+            }],
+            end_turn: None,
+            phase: Some(MessagePhase::Commentary),
+        });
     let prior_item_json = serde_json::to_value(&prior_item).unwrap();
     writeln!(
         f,
@@ -1280,66 +1283,82 @@ async fn azure_responses_request_includes_store_and_reasoning_ids() {
     let mut client_session = client.new_session();
 
     let mut prompt = Prompt::default();
-    prompt.input.push(ResponseItem::Reasoning {
-        id: "reasoning-id".into(),
-        summary: vec![ReasoningItemReasoningSummary::SummaryText {
-            text: "summary".into(),
-        }],
-        content: Some(vec![ReasoningItemContent::ReasoningText {
-            text: "content".into(),
-        }]),
-        encrypted_content: None,
-    });
-    prompt.input.push(ResponseItem::Message {
-        id: Some("message-id".into()),
-        role: "assistant".into(),
-        content: vec![ContentItem::OutputText {
-            text: "message".into(),
-        }],
-        end_turn: None,
-        phase: None,
-    });
-    prompt.input.push(ResponseItem::WebSearchCall {
-        id: Some("web-search-id".into()),
-        status: Some("completed".into()),
-        action: Some(WebSearchAction::Search {
-            query: Some("weather".into()),
-            queries: None,
-        }),
-    });
-    prompt.input.push(ResponseItem::FunctionCall {
-        id: Some("function-id".into()),
-        name: "do_thing".into(),
-        arguments: "{}".into(),
-        call_id: "function-call-id".into(),
-    });
-    prompt.input.push(ResponseItem::FunctionCallOutput {
-        call_id: "function-call-id".into(),
-        output: FunctionCallOutputPayload::from_text("ok".into()),
-    });
-    prompt.input.push(ResponseItem::LocalShellCall {
-        id: Some("local-shell-id".into()),
-        call_id: Some("local-shell-call-id".into()),
-        status: LocalShellStatus::Completed,
-        action: LocalShellAction::Exec(LocalShellExecAction {
-            command: vec!["echo".into(), "hello".into()],
-            timeout_ms: None,
-            working_directory: None,
-            env: None,
-            user: None,
-        }),
-    });
-    prompt.input.push(ResponseItem::CustomToolCall {
-        id: Some("custom-tool-id".into()),
-        status: Some("completed".into()),
-        call_id: "custom-tool-call-id".into(),
-        name: "custom_tool".into(),
-        input: "{}".into(),
-    });
-    prompt.input.push(ResponseItem::CustomToolCallOutput {
-        call_id: "custom-tool-call-id".into(),
-        output: "ok".into(),
-    });
+    prompt
+        .input
+        .push(ResponseItem::Reasoning(codex_protocol::models::Reasoning {
+            id: "reasoning-id".into(),
+            summary: vec![ReasoningItemReasoningSummary::SummaryText {
+                text: "summary".into(),
+            }],
+            content: Some(vec![ReasoningItemContent::ReasoningText {
+                text: "content".into(),
+            }]),
+            encrypted_content: None,
+        }));
+    prompt
+        .input
+        .push(ResponseItem::Message(codex_protocol::models::Message {
+            id: Some("message-id".into()),
+            role: "assistant".into(),
+            content: vec![ContentItem::OutputText {
+                text: "message".into(),
+            }],
+            end_turn: None,
+            phase: None,
+        }));
+    prompt.input.push(ResponseItem::WebSearchCall(
+        codex_protocol::models::WebSearchCall {
+            id: Some("web-search-id".into()),
+            status: Some("completed".into()),
+            action: Some(WebSearchAction::Search {
+                query: Some("weather".into()),
+                queries: None,
+            }),
+        },
+    ));
+    prompt.input.push(ResponseItem::FunctionCall(
+        codex_protocol::models::FunctionCall {
+            id: Some("function-id".into()),
+            name: "do_thing".into(),
+            arguments: "{}".into(),
+            call_id: "function-call-id".into(),
+        },
+    ));
+    prompt.input.push(ResponseItem::FunctionCallOutput(
+        codex_protocol::models::FunctionCallOutput {
+            call_id: "function-call-id".into(),
+            output: FunctionCallOutputPayload::from_text("ok".into()),
+        },
+    ));
+    prompt.input.push(ResponseItem::LocalShellCall(
+        codex_protocol::models::LocalShellCall {
+            id: Some("local-shell-id".into()),
+            call_id: Some("local-shell-call-id".into()),
+            status: LocalShellStatus::Completed,
+            action: LocalShellAction::Exec(LocalShellExecAction {
+                command: vec!["echo".into(), "hello".into()],
+                timeout_ms: None,
+                working_directory: None,
+                env: None,
+                user: None,
+            }),
+        },
+    ));
+    prompt.input.push(ResponseItem::CustomToolCall(
+        codex_protocol::models::CustomToolCall {
+            id: Some("custom-tool-id".into()),
+            status: Some("completed".into()),
+            call_id: "custom-tool-call-id".into(),
+            name: "custom_tool".into(),
+            input: "{}".into(),
+        },
+    ));
+    prompt.input.push(ResponseItem::CustomToolCallOutput(
+        codex_protocol::models::CustomToolCallOutput {
+            call_id: "custom-tool-call-id".into(),
+            output: "ok".into(),
+        },
+    ));
 
     let mut stream = client_session
         .stream(&prompt, &model_info, &otel_manager, effort, summary, None)

codex-rs/core/tests/suite/client_websockets.rs

@@ -622,13 +622,13 @@ async fn responses_websocket_v2_sets_openai_beta_header() {
 }
 
 fn message_item(text: &str) -> ResponseItem {
-    ResponseItem::Message {
+    ResponseItem::Message(codex_protocol::models::Message {
         id: None,
         role: "user".into(),
         content: vec![ContentItem::InputText { text: text.into() }],
         end_turn: None,
         phase: None,
-    }
+    })
 }
 
 fn prompt_with_input(input: Vec<ResponseItem>) -> Prompt {

codex-rs/core/tests/suite/compact.rs

@@ -1444,7 +1444,7 @@ async fn auto_compact_runs_after_resume_when_token_usage_is_over_limit() {
     let remote_summary = "REMOTE_COMPACT_SUMMARY";
 
     let compacted_history = vec![
-        codex_protocol::models::ResponseItem::Message {
+        codex_protocol::models::ResponseItem::Message(codex_protocol::models::Message {
             id: None,
             role: "assistant".to_string(),
             content: vec![codex_protocol::models::ContentItem::OutputText {
@@ -1452,10 +1452,10 @@ async fn auto_compact_runs_after_resume_when_token_usage_is_over_limit() {
             }],
             end_turn: None,
             phase: None,
-        },
-        codex_protocol::models::ResponseItem::Compaction {
+        }),
+        codex_protocol::models::ResponseItem::Compaction(codex_protocol::models::Compaction {
             encrypted_content: "ENCRYPTED_COMPACTION_SUMMARY".to_string(),
-        },
+        }),
     ];
     let compact_mock =
         mount_compact_json_once(&server, serde_json::json!({ "output": compacted_history })).await;
@@ -2266,7 +2266,7 @@ async fn auto_compact_counts_encrypted_reasoning_before_last_user() {
     .await;
 
     let compacted_history = vec![
-        codex_protocol::models::ResponseItem::Message {
+        codex_protocol::models::ResponseItem::Message(codex_protocol::models::Message {
             id: None,
             role: "assistant".to_string(),
             content: vec![codex_protocol::models::ContentItem::OutputText {
@@ -2274,10 +2274,10 @@ async fn auto_compact_counts_encrypted_reasoning_before_last_user() {
             }],
             end_turn: None,
             phase: None,
-        },
-        codex_protocol::models::ResponseItem::Compaction {
+        }),
+        codex_protocol::models::ResponseItem::Compaction(codex_protocol::models::Compaction {
             encrypted_content: "ENCRYPTED_COMPACTION_SUMMARY".to_string(),
-        },
+        }),
     ];
     let compact_mock =
         mount_compact_json_once(&server, serde_json::json!({ "output": compacted_history })).await;
@@ -2386,7 +2386,7 @@ async fn auto_compact_runs_when_reasoning_header_clears_between_turns() {
     mount_response_sequence(&server, responses).await;
 
     let compacted_history = vec![
-        codex_protocol::models::ResponseItem::Message {
+        codex_protocol::models::ResponseItem::Message(codex_protocol::models::Message {
             id: None,
             role: "assistant".to_string(),
             content: vec![codex_protocol::models::ContentItem::OutputText {
@@ -2394,10 +2394,10 @@ async fn auto_compact_runs_when_reasoning_header_clears_between_turns() {
             }],
             end_turn: None,
             phase: None,
-        },
-        codex_protocol::models::ResponseItem::Compaction {
+        }),
+        codex_protocol::models::ResponseItem::Compaction(codex_protocol::models::Compaction {
             encrypted_content: "ENCRYPTED_COMPACTION_SUMMARY".to_string(),
-        },
+        }),
     ];
     let compact_mock =
         mount_compact_json_once(&server, serde_json::json!({ "output": compacted_history })).await;

codex-rs/core/tests/suite/compact_remote.rs

@@ -65,7 +65,7 @@ async fn remote_compact_replaces_history_for_followups() -> Result<()> {
     .await;
 
     let compacted_history = vec![
-        ResponseItem::Message {
+        ResponseItem::Message(codex_protocol::models::Message {
             id: None,
             role: "user".to_string(),
             content: vec![ContentItem::InputText {
@@ -73,10 +73,10 @@ async fn remote_compact_replaces_history_for_followups() -> Result<()> {
             }],
             end_turn: None,
             phase: None,
-        },
-        ResponseItem::Compaction {
+        }),
+        ResponseItem::Compaction(codex_protocol::models::Compaction {
             encrypted_content: "ENCRYPTED_COMPACTION_SUMMARY".to_string(),
-        },
+        }),
     ];
     let compact_mock = responses::mount_compact_json_once(
         harness.server(),
@@ -184,7 +184,7 @@ async fn remote_compact_runs_automatically() -> Result<()> {
     .await;
 
     let compacted_history = vec![
-        ResponseItem::Message {
+        ResponseItem::Message(codex_protocol::models::Message {
             id: None,
             role: "user".to_string(),
             content: vec![ContentItem::InputText {
@@ -192,10 +192,10 @@ async fn remote_compact_runs_automatically() -> Result<()> {
             }],
             end_turn: None,
             phase: None,
-        },
-        ResponseItem::Compaction {
+        }),
+        ResponseItem::Compaction(codex_protocol::models::Compaction {
             encrypted_content: "ENCRYPTED_COMPACTION_SUMMARY".to_string(),
-        },
+        }),
     ];
     let compact_mock = responses::mount_compact_json_once(
         harness.server(),
@@ -783,7 +783,7 @@ async fn remote_manual_compact_emits_context_compaction_items() -> Result<()> {
     .await;
 
     let compacted_history = vec![
-        ResponseItem::Message {
+        ResponseItem::Message(codex_protocol::models::Message {
             id: None,
             role: "user".to_string(),
             content: vec![ContentItem::InputText {
@@ -791,10 +791,10 @@ async fn remote_manual_compact_emits_context_compaction_items() -> Result<()> {
             }],
             end_turn: None,
             phase: None,
-        },
-        ResponseItem::Compaction {
+        }),
+        ResponseItem::Compaction(codex_protocol::models::Compaction {
             encrypted_content: "ENCRYPTED_COMPACTION_SUMMARY".to_string(),
-        },
+        }),
     ];
     let compact_mock = responses::mount_compact_json_once(
         harness.server(),
@@ -881,7 +881,7 @@ async fn remote_compact_persists_replacement_history_in_rollout() -> Result<()>
     .await;
 
     let compacted_history = vec![
-        ResponseItem::Message {
+        ResponseItem::Message(codex_protocol::models::Message {
             id: None,
             role: "user".to_string(),
             content: vec![ContentItem::InputText {
@@ -889,11 +889,11 @@ async fn remote_compact_persists_replacement_history_in_rollout() -> Result<()>
             }],
             end_turn: None,
             phase: None,
-        },
-        ResponseItem::Compaction {
+        }),
+        ResponseItem::Compaction(codex_protocol::models::Compaction {
             encrypted_content: "ENCRYPTED_COMPACTION_SUMMARY".to_string(),
-        },
-        ResponseItem::Message {
+        }),
+        ResponseItem::Message(codex_protocol::models::Message {
             id: None,
             role: "assistant".to_string(),
             content: vec![ContentItem::OutputText {
@@ -901,7 +901,7 @@ async fn remote_compact_persists_replacement_history_in_rollout() -> Result<()>
             }],
             end_turn: None,
             phase: None,
-        },
+        }),
     ];
     let compact_mock = responses::mount_compact_json_once(
         harness.server(),
@@ -946,7 +946,7 @@ async fn remote_compact_persists_replacement_history_in_rollout() -> Result<()>
             let has_compacted_user_summary = replacement_history.iter().any(|item| {
                 matches!(
                     item,
-                    ResponseItem::Message { role, content, .. }
+                    ResponseItem::Message(codex_protocol::models::Message { role, content, .. })
                         if role == "user"
                             && content.iter().any(|part| matches!(
                                 part,
@@ -957,14 +957,14 @@ async fn remote_compact_persists_replacement_history_in_rollout() -> Result<()>
             let has_compaction_item = replacement_history.iter().any(|item| {
                 matches!(
                     item,
-                    ResponseItem::Compaction { encrypted_content }
+                    ResponseItem::Compaction(codex_protocol::models::Compaction { encrypted_content })
                         if encrypted_content == "ENCRYPTED_COMPACTION_SUMMARY"
                 )
             });
             let has_compacted_assistant_note = replacement_history.iter().any(|item| {
                 matches!(
                     item,
-                    ResponseItem::Message { role, content, .. }
+                    ResponseItem::Message(codex_protocol::models::Message { role, content, .. })
                         if role == "assistant"
                             && content.iter().any(|part| matches!(
                                 part,
@@ -975,7 +975,7 @@ async fn remote_compact_persists_replacement_history_in_rollout() -> Result<()>
             let has_permissions_developer_message = replacement_history.iter().any(|item| {
                 matches!(
                     item,
-                    ResponseItem::Message { role, content, .. }
+                    ResponseItem::Message(codex_protocol::models::Message { role, content, .. })
                         if role == "developer"
                             && content.iter().any(|part| matches!(
                                 part,
@@ -1041,7 +1041,7 @@ async fn remote_compact_and_resume_refresh_stale_developer_instructions() -> Res
     .await;
 
     let compacted_history = vec![
-        ResponseItem::Message {
+        ResponseItem::Message(codex_protocol::models::Message {
             id: None,
             role: "user".to_string(),
             content: vec![ContentItem::InputText {
@@ -1049,8 +1049,8 @@ async fn remote_compact_and_resume_refresh_stale_developer_instructions() -> Res
             }],
             end_turn: None,
             phase: None,
-        },
-        ResponseItem::Message {
+        }),
+        ResponseItem::Message(codex_protocol::models::Message {
             id: None,
             role: "developer".to_string(),
             content: vec![ContentItem::InputText {
@@ -1058,10 +1058,10 @@ async fn remote_compact_and_resume_refresh_stale_developer_instructions() -> Res
             }],
             end_turn: None,
             phase: None,
-        },
-        ResponseItem::Compaction {
+        }),
+        ResponseItem::Compaction(codex_protocol::models::Compaction {
             encrypted_content: "ENCRYPTED_COMPACTION_SUMMARY".to_string(),
-        },
+        }),
     ];
     let compact_mock = responses::mount_compact_json_once(
         &server,
@@ -1182,7 +1182,7 @@ async fn remote_compact_refreshes_stale_developer_instructions_without_resume()
     .await;
 
     let compacted_history = vec![
-        ResponseItem::Message {
+        ResponseItem::Message(codex_protocol::models::Message {
             id: None,
             role: "user".to_string(),
             content: vec![ContentItem::InputText {
@@ -1190,8 +1190,8 @@ async fn remote_compact_refreshes_stale_developer_instructions_without_resume()
             }],
             end_turn: None,
             phase: None,
-        },
-        ResponseItem::Message {
+        }),
+        ResponseItem::Message(codex_protocol::models::Message {
             id: None,
             role: "developer".to_string(),
             content: vec![ContentItem::InputText {
@@ -1199,10 +1199,10 @@ async fn remote_compact_refreshes_stale_developer_instructions_without_resume()
             }],
             end_turn: None,
             phase: None,
-        },
-        ResponseItem::Compaction {
+        }),
+        ResponseItem::Compaction(codex_protocol::models::Compaction {
             encrypted_content: "ENCRYPTED_COMPACTION_SUMMARY".to_string(),
-        },
+        }),
     ];
     let compact_mock = responses::mount_compact_json_once(
         &server,

codex-rs/core/tests/suite/image_rollout.rs

@@ -35,8 +35,11 @@ fn find_user_message_with_image(text: &str) -> Option<ResponseItem> {
             Ok(rollout) => rollout,
             Err(_) => continue,
         };
-        if let RolloutItem::ResponseItem(ResponseItem::Message { role, content, .. }) =
-            &rollout.item
+        if let RolloutItem::ResponseItem(ResponseItem::Message(codex_protocol::models::Message {
+            role,
+            content,
+            ..
+        })) = &rollout.item
             && role == "user"
             && content
                 .iter()
@@ -51,10 +54,12 @@ fn find_user_message_with_image(text: &str) -> Option<ResponseItem> {
 
 fn extract_image_url(item: &ResponseItem) -> Option<String> {
     match item {
-        ResponseItem::Message { content, .. } => content.iter().find_map(|span| match span {
-            ContentItem::InputImage { image_url } => Some(image_url.clone()),
-            _ => None,
-        }),
+        ResponseItem::Message(codex_protocol::models::Message { content, .. }) => {
+            content.iter().find_map(|span| match span {
+                ContentItem::InputImage { image_url } => Some(image_url.clone()),
+                _ => None,
+            })
+        }
         _ => None,
     }
 }
@@ -142,7 +147,7 @@ async fn copy_paste_local_image_persists_rollout_request_shape() -> anyhow::Resu
         .expect("expected user message with input image in rollout");
 
     let image_url = extract_image_url(&actual).expect("expected image url in rollout");
-    let expected = ResponseItem::Message {
+    let expected = ResponseItem::Message(codex_protocol::models::Message {
         id: None,
         role: "user".to_string(),
         content: vec![
@@ -159,7 +164,7 @@ async fn copy_paste_local_image_persists_rollout_request_shape() -> anyhow::Resu
         ],
         end_turn: None,
         phase: None,
-    };
+    });
 
     assert_eq!(actual, expected);
 
@@ -224,7 +229,7 @@ async fn drag_drop_image_persists_rollout_request_shape() -> anyhow::Result<()>
         .expect("expected user message with input image in rollout");
 
     let image_url = extract_image_url(&actual).expect("expected image url in rollout");
-    let expected = ResponseItem::Message {
+    let expected = ResponseItem::Message(codex_protocol::models::Message {
         id: None,
         role: "user".to_string(),
         content: vec![
@@ -241,7 +246,7 @@ async fn drag_drop_image_persists_rollout_request_shape() -> anyhow::Result<()>
         ],
         end_turn: None,
         phase: None,
-    };
+    });
 
     assert_eq!(actual, expected);
 

codex-rs/core/tests/suite/override_updates.rs

@@ -61,7 +61,7 @@ fn rollout_developer_texts(text: &str) -> Vec<String> {
             Ok(rollout) => rollout,
             Err(_) => continue,
         };
-        if let RolloutItem::ResponseItem(ResponseItem::Message { role, content, .. }) =
+        if let RolloutItem::ResponseItem(ResponseItem::Message(codex_protocol::models::Message { role, content, .. })) =
             rollout.item
             && role == "developer"
         {
@@ -86,7 +86,7 @@ fn rollout_environment_texts(text: &str) -> Vec<String> {
             Ok(rollout) => rollout,
             Err(_) => continue,
         };
-        if let RolloutItem::ResponseItem(ResponseItem::Message { role, content, .. }) =
+        if let RolloutItem::ResponseItem(ResponseItem::Message(codex_protocol::models::Message { role, content, .. })) =
             rollout.item
             && role == "user"
         {

codex-rs/core/tests/suite/review.rs

@@ -130,7 +130,12 @@ async fn review_op_emits_lifecycle_and_review_output() {
         }
         let v: serde_json::Value = serde_json::from_str(line).expect("jsonl line");
         let rl: RolloutLine = serde_json::from_value(v).expect("rollout line");
-        if let RolloutItem::ResponseItem(ResponseItem::Message { role, content, .. }) = rl.item {
+        if let RolloutItem::ResponseItem(ResponseItem::Message(codex_protocol::models::Message {
+            role,
+            content,
+            ..
+        })) = rl.item
+        {
             if role == "user" {
                 for c in content {
                     if let ContentItem::InputText { text } = c {
@@ -523,7 +528,7 @@ async fn review_input_isolated_from_parent_history() {
             .unwrap();
 
         // Prior user message (enveloped response_item)
-        let user = codex_protocol::models::ResponseItem::Message {
+        let user = codex_protocol::models::ResponseItem::Message(codex_protocol::models::Message {
             id: None,
             role: "user".to_string(),
             content: vec![codex_protocol::models::ContentItem::InputText {
@@ -531,7 +536,7 @@ async fn review_input_isolated_from_parent_history() {
             }],
             end_turn: None,
             phase: None,
-        };
+        });
         let user_json = serde_json::to_value(&user).unwrap();
         let user_line = serde_json::json!({
             "timestamp": "2024-01-01T00:00:01.000Z",
@@ -543,15 +548,16 @@ async fn review_input_isolated_from_parent_history() {
             .unwrap();
 
         // Prior assistant message (enveloped response_item)
-        let assistant = codex_protocol::models::ResponseItem::Message {
-            id: None,
-            role: "assistant".to_string(),
-            content: vec![codex_protocol::models::ContentItem::OutputText {
-                text: "parent: assistant reply".to_string(),
-            }],
-            end_turn: None,
-            phase: None,
-        };
+        let assistant =
+            codex_protocol::models::ResponseItem::Message(codex_protocol::models::Message {
+                id: None,
+                role: "assistant".to_string(),
+                content: vec![codex_protocol::models::ContentItem::OutputText {
+                    text: "parent: assistant reply".to_string(),
+                }],
+                end_turn: None,
+                phase: None,
+            });
         let assistant_json = serde_json::to_value(&assistant).unwrap();
         let assistant_line = serde_json::json!({
             "timestamp": "2024-01-01T00:00:02.000Z",
@@ -636,7 +642,11 @@ async fn review_input_isolated_from_parent_history() {
         }
         let v: serde_json::Value = serde_json::from_str(line).expect("jsonl line");
         let rl: RolloutLine = serde_json::from_value(v).expect("rollout line");
-        if let RolloutItem::ResponseItem(ResponseItem::Message { role, content, .. }) = rl.item
+        if let RolloutItem::ResponseItem(ResponseItem::Message(codex_protocol::models::Message {
+            role,
+            content,
+            ..
+        })) = rl.item
             && role == "user"
         {
             for c in content {

codex-rs/otel/src/traces/otel_manager.rs

@@ -102,13 +102,21 @@ impl OtelManager {
         match event {
             ResponseEvent::OutputItemDone(item) => {
                 handle_responses_span.record("from", "output_item_done");
-                if let ResponseItem::FunctionCall { name, .. } = &item {
+                if let ResponseItem::FunctionCall(codex_protocol::models::FunctionCall {
+                    name,
+                    ..
+                }) = &item
+                {
                     handle_responses_span.record("tool_name", name.as_str());
                 }
             }
             ResponseEvent::OutputItemAdded(item) => {
                 handle_responses_span.record("from", "output_item_added");
-                if let ResponseItem::FunctionCall { name, .. } = &item {
+                if let ResponseItem::FunctionCall(codex_protocol::models::FunctionCall {
+                    name,
+                    ..
+                }) = &item
+                {
                     handle_responses_span.record("tool_name", name.as_str());
                 }
             }
@@ -755,16 +763,34 @@ impl OtelManager {
 
     fn responses_item_type(item: &ResponseItem) -> String {
         match item {
-            ResponseItem::Message { role, .. } => format!("message_from_{role}"),
-            ResponseItem::Reasoning { .. } => "reasoning".into(),
-            ResponseItem::LocalShellCall { .. } => "local_shell_call".into(),
-            ResponseItem::FunctionCall { .. } => "function_call".into(),
-            ResponseItem::FunctionCallOutput { .. } => "function_call_output".into(),
-            ResponseItem::CustomToolCall { .. } => "custom_tool_call".into(),
-            ResponseItem::CustomToolCallOutput { .. } => "custom_tool_call_output".into(),
-            ResponseItem::WebSearchCall { .. } => "web_search_call".into(),
-            ResponseItem::GhostSnapshot { .. } => "ghost_snapshot".into(),
-            ResponseItem::Compaction { .. } => "compaction".into(),
+            ResponseItem::Message(codex_protocol::models::Message { role, .. }) => {
+                format!("message_from_{role}")
+            }
+            ResponseItem::Reasoning(codex_protocol::models::Reasoning { .. }) => "reasoning".into(),
+            ResponseItem::LocalShellCall(codex_protocol::models::LocalShellCall { .. }) => {
+                "local_shell_call".into()
+            }
+            ResponseItem::FunctionCall(codex_protocol::models::FunctionCall { .. }) => {
+                "function_call".into()
+            }
+            ResponseItem::FunctionCallOutput(codex_protocol::models::FunctionCallOutput {
+                ..
+            }) => "function_call_output".into(),
+            ResponseItem::CustomToolCall(codex_protocol::models::CustomToolCall { .. }) => {
+                "custom_tool_call".into()
+            }
+            ResponseItem::CustomToolCallOutput(codex_protocol::models::CustomToolCallOutput {
+                ..
+            }) => "custom_tool_call_output".into(),
+            ResponseItem::WebSearchCall(codex_protocol::models::WebSearchCall { .. }) => {
+                "web_search_call".into()
+            }
+            ResponseItem::GhostSnapshot(codex_protocol::models::GhostSnapshot { .. }) => {
+                "ghost_snapshot".into()
+            }
+            ResponseItem::Compaction(codex_protocol::models::Compaction { .. }) => {
+                "compaction".into()
+            }
             ResponseItem::Other => "other".into(),
         }
     }

codex-rs/protocol/src/models.rs

@@ -88,82 +88,125 @@ pub enum MessagePhase {
     FinalAnswer,
 }
 
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, JsonSchema, TS)]
+pub struct Message {
+    #[serde(default, skip_serializing)]
+    #[ts(skip)]
+    pub id: Option<String>,
+    pub role: String,
+    pub content: Vec<ContentItem>,
+    // Do not use directly, no available consistently across all providers.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    #[ts(optional)]
+    pub end_turn: Option<bool>,
+    // Optional output-message phase (for example: "commentary", "final_answer").
+    // Availability varies by provider/model, so downstream consumers must
+    // preserve fallback behavior when this is absent.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    #[ts(optional)]
+    pub phase: Option<MessagePhase>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, JsonSchema, TS)]
+pub struct Reasoning {
+    #[serde(default, skip_serializing)]
+    #[ts(skip)]
+    pub id: String,
+    pub summary: Vec<ReasoningItemReasoningSummary>,
+    #[serde(default, skip_serializing_if = "should_serialize_reasoning_content")]
+    #[ts(optional)]
+    pub content: Option<Vec<ReasoningItemContent>>,
+    pub encrypted_content: Option<String>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, JsonSchema, TS)]
+pub struct LocalShellCall {
+    /// Legacy id field retained for compatibility with older payloads.
+    #[serde(default, skip_serializing)]
+    #[ts(skip)]
+    pub id: Option<String>,
+    /// Set when using the Responses API.
+    pub call_id: Option<String>,
+    pub status: LocalShellStatus,
+    pub action: LocalShellAction,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, JsonSchema, TS)]
+pub struct FunctionCall {
+    #[serde(default, skip_serializing)]
+    #[ts(skip)]
+    pub id: Option<String>,
+    // The Responses API returns the function call arguments as a *string* that contains
+    // JSON, not as an already‑parsed object. We keep it as a raw string here and let
+    // Session::handle_function_call parse it into a Value.
+    pub name: String,
+    pub arguments: String,
+    pub call_id: String,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, JsonSchema, TS)]
+pub struct FunctionCallOutput {
+    pub call_id: String,
+    pub output: FunctionCallOutputPayload,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, JsonSchema, TS)]
+pub struct CustomToolCall {
+    #[serde(default, skip_serializing)]
+    #[ts(skip)]
+    pub id: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    #[ts(optional)]
+    pub status: Option<String>,
+    pub call_id: String,
+    pub name: String,
+    pub input: String,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, JsonSchema, TS)]
+pub struct CustomToolCallOutput {
+    pub call_id: String,
+    pub output: String,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, JsonSchema, TS)]
+pub struct WebSearchCall {
+    #[serde(default, skip_serializing)]
+    #[ts(skip)]
+    pub id: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    #[ts(optional)]
+    pub status: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    #[ts(optional)]
+    pub action: Option<WebSearchAction>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, JsonSchema, TS)]
+pub struct GhostSnapshot {
+    pub ghost_commit: GhostCommit,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, JsonSchema, TS)]
+pub struct Compaction {
+    pub encrypted_content: String,
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, JsonSchema, TS)]
 #[serde(tag = "type", rename_all = "snake_case")]
 pub enum ResponseItem {
-    Message {
-        #[serde(default, skip_serializing)]
-        #[ts(skip)]
-        id: Option<String>,
-        role: String,
-        content: Vec<ContentItem>,
-        // Do not use directly, no available consistently across all providers.
-        #[serde(default, skip_serializing_if = "Option::is_none")]
-        #[ts(optional)]
-        end_turn: Option<bool>,
-        // Optional output-message phase (for example: "commentary", "final_answer").
-        // Availability varies by provider/model, so downstream consumers must
-        // preserve fallback behavior when this is absent.
-        #[serde(default, skip_serializing_if = "Option::is_none")]
-        #[ts(optional)]
-        phase: Option<MessagePhase>,
-    },
-    Reasoning {
-        #[serde(default, skip_serializing)]
-        #[ts(skip)]
-        id: String,
-        summary: Vec<ReasoningItemReasoningSummary>,
-        #[serde(default, skip_serializing_if = "should_serialize_reasoning_content")]
-        #[ts(optional)]
-        content: Option<Vec<ReasoningItemContent>>,
-        encrypted_content: Option<String>,
-    },
-    LocalShellCall {
-        /// Legacy id field retained for compatibility with older payloads.
-        #[serde(default, skip_serializing)]
-        #[ts(skip)]
-        id: Option<String>,
-        /// Set when using the Responses API.
-        call_id: Option<String>,
-        status: LocalShellStatus,
-        action: LocalShellAction,
-    },
-    FunctionCall {
-        #[serde(default, skip_serializing)]
-        #[ts(skip)]
-        id: Option<String>,
-        name: String,
-        // The Responses API returns the function call arguments as a *string* that contains
-        // JSON, not as an already‑parsed object. We keep it as a raw string here and let
-        // Session::handle_function_call parse it into a Value.
-        arguments: String,
-        call_id: String,
-    },
+    Message(Message),
+    Reasoning(Reasoning),
+    LocalShellCall(LocalShellCall),
+    FunctionCall(FunctionCall),
     // NOTE: The `output` field for `function_call_output` uses a dedicated payload type with
     // custom serialization. On the wire it is either:
     //   - a plain string (`content`)
     //   - an array of structured content items (`content_items`)
     // We keep this behavior centralized in `FunctionCallOutputPayload`.
-    FunctionCallOutput {
-        call_id: String,
-        output: FunctionCallOutputPayload,
-    },
-    CustomToolCall {
-        #[serde(default, skip_serializing)]
-        #[ts(skip)]
-        id: Option<String>,
-        #[serde(default, skip_serializing_if = "Option::is_none")]
-        #[ts(optional)]
-        status: Option<String>,
-
-        call_id: String,
-        name: String,
-        input: String,
-    },
-    CustomToolCallOutput {
-        call_id: String,
-        output: String,
-    },
+    FunctionCallOutput(FunctionCallOutput),
+    CustomToolCall(CustomToolCall),
+    CustomToolCallOutput(CustomToolCallOutput),
     // Emitted by the Responses API when the agent triggers a web search.
     // Example payload (from SSE `response.output_item.done`):
     // {
@@ -172,25 +215,11 @@ pub enum ResponseItem {
     //   "status":"completed",
     //   "action": {"type":"search","query":"weather: San Francisco, CA"}
     // }
-    WebSearchCall {
-        #[serde(default, skip_serializing)]
-        #[ts(skip)]
-        id: Option<String>,
-        #[serde(default, skip_serializing_if = "Option::is_none")]
-        #[ts(optional)]
-        status: Option<String>,
-        #[serde(default, skip_serializing_if = "Option::is_none")]
-        #[ts(optional)]
-        action: Option<WebSearchAction>,
-    },
+    WebSearchCall(WebSearchCall),
     // Generated by the harness but considered exactly as a model response.
-    GhostSnapshot {
-        ghost_commit: GhostCommit,
-    },
+    GhostSnapshot(GhostSnapshot),
     #[serde(alias = "compaction_summary")]
-    Compaction {
-        encrypted_content: String,
-    },
+    Compaction(Compaction),
     #[serde(other)]
     Other,
 }
@@ -459,7 +488,7 @@ fn render_command_prefix(prefix: &[String]) -> String {
 
 impl From<DeveloperInstructions> for ResponseItem {
     fn from(di: DeveloperInstructions) -> Self {
-        ResponseItem::Message {
+        ResponseItem::Message(Message {
             id: None,
             role: "developer".to_string(),
             content: vec![ContentItem::InputText {
@@ -467,7 +496,7 @@ impl From<DeveloperInstructions> for ResponseItem {
             }],
             end_turn: None,
             phase: None,
-        }
+        })
     }
 }
 
@@ -619,15 +648,15 @@ pub fn local_image_content_items_with_label_number(
 impl From<ResponseInputItem> for ResponseItem {
     fn from(item: ResponseInputItem) -> Self {
         match item {
-            ResponseInputItem::Message { role, content } => Self::Message {
+            ResponseInputItem::Message { role, content } => Self::Message(Message {
                 role,
                 content,
                 id: None,
                 end_turn: None,
                 phase: None,
-            },
+            }),
             ResponseInputItem::FunctionCallOutput { call_id, output } => {
-                Self::FunctionCallOutput { call_id, output }
+                Self::FunctionCallOutput(FunctionCallOutput { call_id, output })
             }
             ResponseInputItem::McpToolCallOutput { call_id, result } => {
                 let output = match result {
@@ -637,10 +666,10 @@ impl From<ResponseInputItem> for ResponseItem {
                         success: Some(false),
                     },
                 };
-                Self::FunctionCallOutput { call_id, output }
+                Self::FunctionCallOutput(FunctionCallOutput { call_id, output })
             }
             ResponseInputItem::CustomToolCallOutput { call_id, output } => {
-                Self::CustomToolCallOutput { call_id, output }
+                Self::CustomToolCallOutput(CustomToolCallOutput { call_id, output })
             }
         }
     }
@@ -1462,9 +1491,9 @@ mod tests {
 
         assert_eq!(
             item,
-            ResponseItem::Compaction {
+            ResponseItem::Compaction(crate::models::Compaction {
                 encrypted_content: "abc".into(),
-            }
+            })
         );
         Ok(())
     }
@@ -1540,11 +1569,11 @@ mod tests {
         for (json_literal, expected_id, expected_action, expected_status, expect_roundtrip) in cases
         {
             let parsed: ResponseItem = serde_json::from_str(json_literal)?;
-            let expected = ResponseItem::WebSearchCall {
+            let expected = ResponseItem::WebSearchCall(crate::models::WebSearchCall {
                 id: expected_id.clone(),
                 status: expected_status.clone(),
                 action: expected_action.clone(),
-            };
+            });
             assert_eq!(parsed, expected);
 
             let serialized = serde_json::to_value(&parsed)?;

codex-rs/protocol/src/protocol.rs

@@ -1720,7 +1720,7 @@ pub struct CompactedItem {
 
 impl From<CompactedItem> for ResponseItem {
     fn from(value: CompactedItem) -> Self {
-        ResponseItem::Message {
+        ResponseItem::Message(crate::models::Message {
             id: None,
             role: "assistant".to_string(),
             content: vec![ContentItem::OutputText {
@@ -1728,7 +1728,7 @@ impl From<CompactedItem> for ResponseItem {
             }],
             end_turn: None,
             phase: None,
-        }
+        })
     }
 }
 

codex-rs/state/src/extract.rs

@@ -137,15 +137,16 @@ mod tests {
     #[test]
     fn response_item_user_messages_do_not_set_title_or_first_user_message() {
         let mut metadata = metadata_for_test();
-        let item = RolloutItem::ResponseItem(ResponseItem::Message {
-            id: None,
-            role: "user".to_string(),
-            content: vec![ContentItem::InputText {
-                text: "hello from response item".to_string(),
-            }],
-            end_turn: None,
-            phase: None,
-        });
+        let item =
+            RolloutItem::ResponseItem(ResponseItem::Message(codex_protocol::models::Message {
+                id: None,
+                role: "user".to_string(),
+                content: vec![ContentItem::InputText {
+                    text: "hello from response item".to_string(),
+                }],
+                end_turn: None,
+                phase: None,
+            }));
 
         apply_rollout_item(&mut metadata, &item, "test-provider");