Lightweight coding agent that runs in your terminal
Rust
Add opt-in output token replay for OpenAI requests (#52742)
pakrym-oai5ef96ab2785f
diff --git a/codex-rs/app-server-protocol/schema/json/ClientRequest.json b/codex-rs/app-server-protocol/schema/json/ClientRequest.jsonindex fbd74dc548..4e9211b36a 100644--- a/codex-rs/app-server-protocol/schema/json/ClientRequest.json+++ b/codex-rs/app-server-protocol/schema/json/ClientRequest.json@@ -733,6 +733,20 @@},{"properties": {+ "annotations": {+ "items": true,+ "type": [+ "array",+ "null"+ ]+ },+ "logprobs": {+ "items": true,+ "type": [+ "array",+ "null"+ ]+ },"text": {"type": "string"},@@ -2988,6 +3002,12 @@},"type": "array"},+ "encrypted_content": {+ "type": [+ "string",+ "null"+ ]+ },"id": {"type": ["string",@@ -3017,6 +3037,12 @@"role": {"type": "string"},+ "status": {+ "type": [+ "string",+ "null"+ ]+ },"type": {"enum": ["message"@@ -3147,6 +3173,12 @@"null"]},+ "encrypted_content": {+ "type": [+ "string",+ "null"+ ]+ },"id": {"description": "Legacy id field retained for compatibility with older payloads.","type": [@@ -3191,6 +3223,12 @@"call_id": {"type": "string"},+ "encrypted_content": {+ "type": [+ "string",+ "null"+ ]+ },"encrypted_function_args": {"items": {"type": "string"@@ -3225,6 +3263,12 @@"null"]},+ "status": {+ "type": [+ "string",+ "null"+ ]+ },"type": {"enum": ["function_call"@@ -3251,6 +3295,12 @@"null"]},+ "encrypted_content": {+ "type": [+ "string",+ "null"+ ]+ },"execution": {"type": "string"},@@ -3351,6 +3401,12 @@"call_id": {"type": "string"},+ "encrypted_content": {+ "type": [+ "string",+ "null"+ ]+ },"id": {"type": ["string",@@ -3511,6 +3567,12 @@}]},+ "encrypted_content": {+ "type": [+ "string",+ "null"+ ]+ },"id": {"type": ["string",@@ -3549,6 +3611,12 @@},{"properties": {+ "encrypted_content": {+ "type": [+ "string",+ "null"+ ]+ },"id": {"type": ["string",diff --git a/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.schemas.json b/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.schemas.jsonindex fb2356184d..b96da22504 100644--- a/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.schemas.json+++ b/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.schemas.json@@ -10746,6 +10746,20 @@},{"properties": {+ "annotations": {+ "items": true,+ "type": [+ "array",+ "null"+ ]+ },+ "logprobs": {+ "items": true,+ "type": [+ "array",+ "null"+ ]+ },"text": {"type": "string"},@@ -18845,6 +18859,12 @@},"type": "array"},+ "encrypted_content": {+ "type": [+ "string",+ "null"+ ]+ },"id": {"type": ["string",@@ -18874,6 +18894,12 @@"role": {"type": "string"},+ "status": {+ "type": [+ "string",+ "null"+ ]+ },"type": {"enum": ["message"@@ -19004,6 +19030,12 @@"null"]},+ "encrypted_content": {+ "type": [+ "string",+ "null"+ ]+ },"id": {"description": "Legacy id field retained for compatibility with older payloads.","type": [@@ -19048,6 +19080,12 @@"call_id": {"type": "string"},+ "encrypted_content": {+ "type": [+ "string",+ "null"+ ]+ },"encrypted_function_args": {"items": {"type": "string"@@ -19082,6 +19120,12 @@"null"]},+ "status": {+ "type": [+ "string",+ "null"+ ]+ },"type": {"enum": ["function_call"@@ -19108,6 +19152,12 @@"null"]},+ "encrypted_content": {+ "type": [+ "string",+ "null"+ ]+ },"execution": {"type": "string"},@@ -19208,6 +19258,12 @@"call_id": {"type": "string"},+ "encrypted_content": {+ "type": [+ "string",+ "null"+ ]+ },"id": {"type": ["string",@@ -19368,6 +19424,12 @@}]},+ "encrypted_content": {+ "type": [+ "string",+ "null"+ ]+ },"id": {"type": ["string",@@ -19406,6 +19468,12 @@},{"properties": {+ "encrypted_content": {+ "type": [+ "string",+ "null"+ ]+ },"id": {"type": ["string",diff --git a/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.v2.schemas.json b/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.v2.schemas.jsonindex 307f9a8b5c..6d7bfd8937 100644--- a/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.v2.schemas.json+++ b/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.v2.schemas.json@@ -6562,6 +6562,20 @@},{"properties": {+ "annotations": {+ "items": true,+ "type": [+ "array",+ "null"+ ]+ },+ "logprobs": {+ "items": true,+ "type": [+ "array",+ "null"+ ]+ },"text": {"type": "string"},@@ -14837,6 +14851,12 @@},"type": "array"},+ "encrypted_content": {+ "type": [+ "string",+ "null"+ ]+ },"id": {"type": ["string",@@ -14866,6 +14886,12 @@"role": {"type": "string"},+ "status": {+ "type": [+ "string",+ "null"+ ]+ },"type": {"enum": ["message"@@ -14996,6 +15022,12 @@"null"]},+ "encrypted_content": {+ "type": [+ "string",+ "null"+ ]+ },"id": {"description": "Legacy id field retained for compatibility with older payloads.","type": [@@ -15040,6 +15072,12 @@"call_id": {"type": "string"},+ "encrypted_content": {+ "type": [+ "string",+ "null"+ ]+ },"encrypted_function_args": {"items": {"type": "string"@@ -15074,6 +15112,12 @@"null"]},+ "status": {+ "type": [+ "string",+ "null"+ ]+ },"type": {"enum": ["function_call"@@ -15100,6 +15144,12 @@"null"]},+ "encrypted_content": {+ "type": [+ "string",+ "null"+ ]+ },"execution": {"type": "string"},@@ -15200,6 +15250,12 @@"call_id": {"type": "string"},+ "encrypted_content": {+ "type": [+ "string",+ "null"+ ]+ },"id": {"type": ["string",@@ -15360,6 +15416,12 @@}]},+ "encrypted_content": {+ "type": [+ "string",+ "null"+ ]+ },"id": {"type": ["string",@@ -15398,6 +15460,12 @@},{"properties": {+ "encrypted_content": {+ "type": [+ "string",+ "null"+ ]+ },"id": {"type": ["string",diff --git a/codex-rs/app-server-protocol/schema/json/v2/RawResponseItemCompletedNotification.json b/codex-rs/app-server-protocol/schema/json/v2/RawResponseItemCompletedNotification.jsonindex 068d591707..cddb265897 100644--- a/codex-rs/app-server-protocol/schema/json/v2/RawResponseItemCompletedNotification.json+++ b/codex-rs/app-server-protocol/schema/json/v2/RawResponseItemCompletedNotification.json@@ -153,6 +153,20 @@},{"properties": {+ "annotations": {+ "items": true,+ "type": [+ "array",+ "null"+ ]+ },+ "logprobs": {+ "items": true,+ "type": [+ "array",+ "null"+ ]+ },"text": {"type": "string"},@@ -528,6 +542,12 @@},"type": "array"},+ "encrypted_content": {+ "type": [+ "string",+ "null"+ ]+ },"id": {"type": ["string",@@ -557,6 +577,12 @@"role": {"type": "string"},+ "status": {+ "type": [+ "string",+ "null"+ ]+ },"type": {"enum": ["message"@@ -687,6 +713,12 @@"null"]},+ "encrypted_content": {+ "type": [+ "string",+ "null"+ ]+ },"id": {"description": "Legacy id field retained for compatibility with older payloads.","type": [@@ -731,6 +763,12 @@"call_id": {"type": "string"},+ "encrypted_content": {+ "type": [+ "string",+ "null"+ ]+ },"encrypted_function_args": {"items": {"type": "string"@@ -765,6 +803,12 @@"null"]},+ "status": {+ "type": [+ "string",+ "null"+ ]+ },"type": {"enum": ["function_call"@@ -791,6 +835,12 @@"null"]},+ "encrypted_content": {+ "type": [+ "string",+ "null"+ ]+ },"execution": {"type": "string"},@@ -891,6 +941,12 @@"call_id": {"type": "string"},+ "encrypted_content": {+ "type": [+ "string",+ "null"+ ]+ },"id": {"type": ["string",@@ -1051,6 +1107,12 @@}]},+ "encrypted_content": {+ "type": [+ "string",+ "null"+ ]+ },"id": {"type": ["string",@@ -1089,6 +1151,12 @@},{"properties": {+ "encrypted_content": {+ "type": [+ "string",+ "null"+ ]+ },"id": {"type": ["string",diff --git a/codex-rs/app-server-protocol/schema/json/v2/ThreadResumeParams.json b/codex-rs/app-server-protocol/schema/json/v2/ThreadResumeParams.jsonindex 80d7a6a917..65211ef5fd 100644--- a/codex-rs/app-server-protocol/schema/json/v2/ThreadResumeParams.json+++ b/codex-rs/app-server-protocol/schema/json/v2/ThreadResumeParams.json@@ -215,6 +215,20 @@},{"properties": {+ "annotations": {+ "items": true,+ "type": [+ "array",+ "null"+ ]+ },+ "logprobs": {+ "items": true,+ "type": [+ "array",+ "null"+ ]+ },"text": {"type": "string"},@@ -599,6 +613,12 @@},"type": "array"},+ "encrypted_content": {+ "type": [+ "string",+ "null"+ ]+ },"id": {"type": ["string",@@ -628,6 +648,12 @@"role": {"type": "string"},+ "status": {+ "type": [+ "string",+ "null"+ ]+ },"type": {"enum": ["message"@@ -758,6 +784,12 @@"null"]},+ "encrypted_content": {+ "type": [+ "string",+ "null"+ ]+ },"id": {"description": "Legacy id field retained for compatibility with older payloads.","type": [@@ -802,6 +834,12 @@"call_id": {"type": "string"},+ "encrypted_content": {+ "type": [+ "string",+ "null"+ ]+ },"encrypted_function_args": {"items": {"type": "string"@@ -836,6 +874,12 @@"null"]},+ "status": {+ "type": [+ "string",+ "null"+ ]+ },"type": {"enum": ["function_call"@@ -862,6 +906,12 @@"null"]},+ "encrypted_content": {+ "type": [+ "string",+ "null"+ ]+ },"execution": {"type": "string"},@@ -962,6 +1012,12 @@"call_id": {"type": "string"},+ "encrypted_content": {+ "type": [+ "string",+ "null"+ ]+ },"id": {"type": ["string",@@ -1122,6 +1178,12 @@}]},+ "encrypted_content": {+ "type": [+ "string",+ "null"+ ]+ },"id": {"type": ["string",@@ -1160,6 +1222,12 @@},{"properties": {+ "encrypted_content": {+ "type": [+ "string",+ "null"+ ]+ },"id": {"type": ["string",diff --git a/codex-rs/app-server-protocol/schema/precomputed/app-server-exports-experimental.json.zst b/codex-rs/app-server-protocol/schema/precomputed/app-server-exports-experimental.json.zstindex e96b44ac65..b18386f968 100644Binary files a/codex-rs/app-server-protocol/schema/precomputed/app-server-exports-experimental.json.zst and b/codex-rs/app-server-protocol/schema/precomputed/app-server-exports-experimental.json.zst differdiff --git a/codex-rs/app-server-protocol/schema/precomputed/app-server-exports-stable.json.zst b/codex-rs/app-server-protocol/schema/precomputed/app-server-exports-stable.json.zstindex 8f0ae35f22..64de0f45ca 100644Binary files a/codex-rs/app-server-protocol/schema/precomputed/app-server-exports-stable.json.zst and b/codex-rs/app-server-protocol/schema/precomputed/app-server-exports-stable.json.zst differdiff --git a/codex-rs/app-server-protocol/schema/typescript/ContentItem.ts b/codex-rs/app-server-protocol/schema/typescript/ContentItem.tsindex 0ad09f18e4..ca3175c1eb 100644--- a/codex-rs/app-server-protocol/schema/typescript/ContentItem.ts+++ b/codex-rs/app-server-protocol/schema/typescript/ContentItem.ts@@ -3,4 +3,4 @@// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.import type { ImageDetail } from "./ImageDetail";-export type ContentItem = { "type": "input_text", text: string, } | { "type": "input_image", detail?: ImageDetail, } & ({ image_url: string, } | { file_id: string, }) | { "type": "input_audio", audio_url: string, } | { "type": "output_text", text: string, };+export type ContentItem = { "type": "input_text", text: string, } | { "type": "input_image", detail?: ImageDetail, } & ({ image_url: string, } | { file_id: string, }) | { "type": "input_audio", audio_url: string, } | { "type": "output_text", text: string, annotations?: unknown[], logprobs?: unknown[], };diff --git a/codex-rs/app-server-protocol/schema/typescript/ResponseItem.ts b/codex-rs/app-server-protocol/schema/typescript/ResponseItem.tsindex 3e11def4a9..2e6d8f605f 100644--- a/codex-rs/app-server-protocol/schema/typescript/ResponseItem.ts+++ b/codex-rs/app-server-protocol/schema/typescript/ResponseItem.ts@@ -14,7 +14,7 @@ import type { ReasoningItemReasoningSummary } from "./ReasoningItemReasoningSummimport type { ResponseItemId } from "./ResponseItemId";import type { WebSearchAction } from "./WebSearchAction";-export type ResponseItem = { "type": "additional_tools", id?: ResponseItemId, role: string, tools: unknown[], } | { "type": "message", id?: ResponseItemId, role: string, content: Array<ContentItem>, phase?: MessagePhase, internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "agent_message", id?: ResponseItemId, author: string, recipient: string, content: Array<AgentMessageInputContent>, internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "reasoning", id?: ResponseItemId, summary: Array<ReasoningItemReasoningSummary>, content?: Array<ReasoningItemContent>, encrypted_content: string | null, internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "local_shell_call",+export type ResponseItem = { "type": "additional_tools", id?: ResponseItemId, role: string, tools: unknown[], } | { "type": "message", encrypted_content?: string, status?: string, id?: ResponseItemId, role: string, content: Array<ContentItem>, phase?: MessagePhase, internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "agent_message", id?: ResponseItemId, author: string, recipient: string, content: Array<AgentMessageInputContent>, internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "reasoning", id?: ResponseItemId, summary: Array<ReasoningItemReasoningSummary>, content?: Array<ReasoningItemContent>, encrypted_content: string | null, internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "local_shell_call", encrypted_content?: string,/*** Legacy id field retained for compatibility with older payloads.*/@@ -22,4 +22,4 @@ id?: ResponseItemId,/*** Set when using the Responses API.*/-call_id: string | null, status: LocalShellStatus, action: LocalShellAction, internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "function_call", id?: ResponseItemId, name: string, namespace?: string, arguments: string, encrypted_function_args?: Array<string>, call_id: string, internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "tool_search_call", id?: ResponseItemId, call_id: string | null, status?: string, execution: string, arguments: unknown, internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "function_call_output", id?: ResponseItemId, call_id?: string, name?: string, namespace?: string, output: FunctionCallOutputBody, internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "custom_tool_call", id?: ResponseItemId, status?: string, call_id: string, name: string, namespace?: string, input: string, internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "custom_tool_call_output", id?: ResponseItemId, call_id: string, name?: string, output: FunctionCallOutputBody, internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "tool_search_output", id?: ResponseItemId, call_id: string | null, status: string, execution: string, tools: unknown[], internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "web_search_call", id?: ResponseItemId, status?: string, action?: WebSearchAction, internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "image_generation_call", id?: ResponseItemId, status: string, revised_prompt?: string, result: string, internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "compaction", id?: ResponseItemId, encrypted_content: string, internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "configuration_update", reasoning: ConfigurationReasoning, } | { "type": "compaction_trigger", } | { "type": "context_compaction", id?: ResponseItemId, encrypted_content?: string, internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "other" };+call_id: string | null, status: LocalShellStatus, action: LocalShellAction, internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "function_call", encrypted_content?: string, status?: string, id?: ResponseItemId, name: string, namespace?: string, arguments: string, encrypted_function_args?: Array<string>, call_id: string, internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "tool_search_call", encrypted_content?: string, id?: ResponseItemId, call_id: string | null, status?: string, execution: string, arguments: unknown, internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "function_call_output", id?: ResponseItemId, call_id?: string, name?: string, namespace?: string, output: FunctionCallOutputBody, internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "custom_tool_call", encrypted_content?: string, id?: ResponseItemId, status?: string, call_id: string, name: string, namespace?: string, input: string, internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "custom_tool_call_output", id?: ResponseItemId, call_id: string, name?: string, output: FunctionCallOutputBody, internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "tool_search_output", id?: ResponseItemId, call_id: string | null, status: string, execution: string, tools: unknown[], internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "web_search_call", encrypted_content?: string, id?: ResponseItemId, status?: string, action?: WebSearchAction, internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "image_generation_call", encrypted_content?: string, id?: ResponseItemId, status: string, revised_prompt?: string, result: string, internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "compaction", id?: ResponseItemId, encrypted_content: string, internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "configuration_update", reasoning: ConfigurationReasoning, } | { "type": "compaction_trigger", } | { "type": "context_compaction", id?: ResponseItemId, encrypted_content?: string, internal_chat_message_metadata_passthrough?: InternalChatMessageMetadataPassthrough, } | { "type": "other" };diff --git a/codex-rs/app-server-protocol/src/protocol/thread_history.rs b/codex-rs/app-server-protocol/src/protocol/thread_history.rsindex 18b87d9ce4..53817bb9e5 100644--- a/codex-rs/app-server-protocol/src/protocol/thread_history.rs+++ b/codex-rs/app-server-protocol/src/protocol/thread_history.rs@@ -5233,6 +5233,8 @@ mod tests {})),RolloutItem::ResponseItem(codex_protocol::models::ResponseItem::Message {+ status: None,+ encrypted_content: None,id: Some(codex_protocol::ResponseItemId::with_suffix("msg", "1")),role: "user".into(),content: vec![codex_protocol::models::ContentItem::InputText {diff --git a/codex-rs/app-server/tests/suite/v2/mcp_resource.rs b/codex-rs/app-server/tests/suite/v2/mcp_resource.rsindex f3b87e7e52..b25a2098fd 100644--- a/codex-rs/app-server/tests/suite/v2/mcp_resource.rs+++ b/codex-rs/app-server/tests/suite/v2/mcp_resource.rs@@ -615,6 +615,8 @@ async fn metadata_and_mcp_requests_complete_while_unrelated_resume_loads_config(thread_id: "00000000-0000-4000-8000-000000000000".to_string(),cwd: Some(resume_cwd.path().to_string_lossy().into_owned()),history: Some(vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {diff --git a/codex-rs/app-server/tests/suite/v2/thread_fork.rs b/codex-rs/app-server/tests/suite/v2/thread_fork.rsindex d0c9e1a80c..00faaafe95 100644--- a/codex-rs/app-server/tests/suite/v2/thread_fork.rs+++ b/codex-rs/app-server/tests/suite/v2/thread_fork.rs@@ -1838,6 +1838,8 @@ async fn assert_thread_fork_freezes_active_paginated_turn_as_interrupted(let user_response_item = |id: &str| {RolloutItem::ResponseItem(ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {diff --git a/codex-rs/app-server/tests/suite/v2/thread_inject_items.rs b/codex-rs/app-server/tests/suite/v2/thread_inject_items.rsindex a07a8dd936..f2720fedf1 100644--- a/codex-rs/app-server/tests/suite/v2/thread_inject_items.rs+++ b/codex-rs/app-server/tests/suite/v2/thread_inject_items.rs@@ -87,15 +87,21 @@ async fn thread_inject_items_adds_raw_response_items_to_thread_history(let injected_text = "Injected assistant context";let injected_item = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "assistant".to_string(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: injected_text.to_string(),}],phase: None,internal_chat_message_metadata_passthrough: None,};let developer_item = |text: &str| ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "developer".to_string(),content: vec![ContentItem::InputText {@@ -561,6 +567,8 @@ async fn thread_inject_items_adds_raw_response_items_after_a_turn() -> Result<().await??;let injected_item = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "developer".to_string(),content: vec![ContentItem::InputText {diff --git a/codex-rs/app-server/tests/suite/v2/thread_resume.rs b/codex-rs/app-server/tests/suite/v2/thread_resume.rsindex 0c005f7dab..7a2f671ac9 100644--- a/codex-rs/app-server/tests/suite/v2/thread_resume.rs+++ b/codex-rs/app-server/tests/suite/v2/thread_resume.rs@@ -4972,6 +4972,8 @@ async fn thread_resume_rejects_history_when_thread_is_running() -> Result<()> {.send_thread_resume_request(ThreadResumeParams {thread_id: thread_id.clone(),history: Some(vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -6101,6 +6103,8 @@ async fn thread_resume_supports_history_and_overrides() -> Result<()> {let history_text = "Hello from history";let history = vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {diff --git a/codex-rs/codex-api/src/endpoint/responses_websocket.rs b/codex-rs/codex-api/src/endpoint/responses_websocket.rsindex 4e041ab0a5..5418b1c235 100644--- a/codex-rs/codex-api/src/endpoint/responses_websocket.rs+++ b/codex-rs/codex-api/src/endpoint/responses_websocket.rs@@ -946,6 +946,8 @@ mod tests {let api_request = ResponsesApiRequest {model: "gpt-test".to_string(),input: vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: Some(ResponseItemId::with_suffix("msg", "1")),role: "user".to_string(),content: vec![ContentItem::InputText {diff --git a/codex-rs/codex-api/src/endpoint/search.rs b/codex-rs/codex-api/src/endpoint/search.rsindex 2de48fe7db..502e264b4b 100644--- a/codex-rs/codex-api/src/endpoint/search.rs+++ b/codex-rs/codex-api/src/endpoint/search.rs@@ -157,6 +157,8 @@ mod tests {model: "gpt-test".to_string(),reasoning: None,input: Some(SearchInput::Items(vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: Some(ResponseItemId::with_suffix("msg", "search")),role: "user".to_string(),content: vec![diff --git a/codex-rs/codex-api/src/sse/responses.rs b/codex-rs/codex-api/src/sse/responses.rsindex 78885f43de..e68d4bb7b7 100644--- a/codex-rs/codex-api/src/sse/responses.rs+++ b/codex-rs/codex-api/src/sse/responses.rs@@ -770,6 +770,8 @@ mod tests {] if start_content.is_empty()&& text == "First result."&& done_content == &vec![codex_protocol::models::ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: "First result.".to_string()}]);}diff --git a/codex-rs/codex-api/tests/clients.rs b/codex-rs/codex-api/tests/clients.rsindex b17da45344..a7400d306e 100644--- a/codex-rs/codex-api/tests/clients.rs+++ b/codex-rs/codex-api/tests/clients.rs@@ -340,6 +340,8 @@ async fn responses_client_stream_request_preserves_item_ids() -> Result<()> {let request = ResponsesApiRequest {model: "gpt-test".into(),input: vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: Some(ResponseItemId::with_suffix("msg", "1")),role: "user".into(),content: vec![ContentItem::InputText { text: "hi".into() }],@@ -394,6 +396,8 @@ async fn responses_client_stream_request_sends_routing_fields_ahead_of_large_inplet request = ResponsesApiRequest {model: "gpt-test".into(),input: vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".into(),content: vec![ContentItem::InputText { text: large_input }],@@ -604,6 +608,8 @@ async fn azure_store_sends_ids_and_headers() -> Result<()> {let request = ResponsesApiRequest {model: "gpt-test".into(),input: vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: Some(ResponseItemId::with_suffix("msg", "1")),role: "user".into(),content: vec![ContentItem::InputText { text: "hi".into() }],diff --git a/codex-rs/context-fragments/src/fragment.rs b/codex-rs/context-fragments/src/fragment.rsindex f01a4a66e4..f3f1c3bb8b 100644--- a/codex-rs/context-fragments/src/fragment.rs+++ b/codex-rs/context-fragments/src/fragment.rs@@ -38,6 +38,8 @@ impl From<RenderedFragment> for ResponseItem {let (content, content_kind) = annotated_content.into_parts();Self::Message {+ status: None,+ encrypted_content: None,id: None,role: role.to_string(),content: vec![content],diff --git a/codex-rs/core/config.schema.json b/codex-rs/core/config.schema.jsonindex bc1fd50407..2b971cd489 100644--- a/codex-rs/core/config.schema.json+++ b/codex-rs/core/config.schema.json@@ -1052,6 +1052,9 @@"omit_app_server_notification_media": {"type": "boolean"},+ "output_token_replay": {+ "type": "boolean"+ },"personality": {"type": "boolean"},@@ -7352,6 +7355,9 @@"omit_app_server_notification_media": {"type": "boolean"},+ "output_token_replay": {+ "type": "boolean"+ },"personality": {"type": "boolean"},diff --git a/codex-rs/core/src/agent/control_tests.rs b/codex-rs/core/src/agent/control_tests.rsindex 6df46c1d78..d22fb97d29 100644--- a/codex-rs/core/src/agent/control_tests.rs+++ b/codex-rs/core/src/agent/control_tests.rs@@ -196,6 +196,8 @@ fn rollout_response_item(item: ResponseItem) -> RolloutItem {fn user_message(text: &str) -> ResponseItem {ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -208,9 +210,13 @@ fn user_message(text: &str) -> ResponseItem {fn assistant_message(text: &str, phase: Option<MessagePhase>) -> ResponseItem {ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "assistant".to_string(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: text.to_string(),}],phase,@@ -237,6 +243,8 @@ fn register_session_root_skips_threads_with_explicit_parent() {fn spawn_agent_call(call_id: &str) -> ResponseItem {ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,name: "spawn_agent".to_string(),namespace: None,@@ -354,7 +362,7 @@ fn has_subagent_notification<'a>(return false;}content.iter().any(|content_item| match content_item {- ContentItem::InputText { text } | ContentItem::OutputText { text } => {+ ContentItem::InputText { text } | ContentItem::OutputText { text, .. } => {SubagentNotification::matches_text(text)}ContentItem::InputImage { .. } | ContentItem::InputAudio { .. } => false,@@ -372,7 +380,7 @@ fn history_contains_text<'a>(return false;};content.iter().any(|content_item| match content_item {- ContentItem::InputText { text } | ContentItem::OutputText { text } => {+ ContentItem::InputText { text } | ContentItem::OutputText { text, .. } => {text.contains(needle)}ContentItem::InputImage { .. } | ContentItem::InputAudio { .. } => false,@@ -415,7 +423,7 @@ fn history_contains_assistant_inter_agent_communication<'a>(return false;}content.iter().any(|content_item| match content_item {- ContentItem::OutputText { text } => {+ ContentItem::OutputText { text, .. } => {serde_json::from_str::<InterAgentCommunication>(text).ok().as_ref()@@ -2307,6 +2315,8 @@ async fn spawn_agent_fork_from_paginated_parent_uses_model_context_prefix(.session.persist_rollout_items(&[rollout_response_item(ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "developer".to_string(),content: vec![ContentItem::InputText {@@ -2816,6 +2826,8 @@ async fn spawn_agent_can_fork_parent_thread_history_with_sanitized_items() {turn_context.as_ref(), turn_context.model_info(),&[ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "developer".to_string(),content: vec![ContentItem::InputText {@@ -2825,6 +2837,8 @@ async fn spawn_agent_can_fork_parent_thread_history_with_sanitized_items() {internal_chat_message_metadata_passthrough: None,},ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "developer".to_string(),content: vec![ContentItem::InputText {@@ -2834,6 +2848,8 @@ async fn spawn_agent_can_fork_parent_thread_history_with_sanitized_items() {internal_chat_message_metadata_passthrough: None,},ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "developer".to_string(),content: vec![@@ -2987,6 +3003,8 @@ async fn spawn_agent_can_fork_parent_thread_history_with_sanitized_items() {.cloned().expect("parent final answer should be recorded");let mut expected_developer_message = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "developer".to_string(),content: vec![@@ -3196,6 +3214,8 @@ async fn spawn_agent_fork_strips_parent_usage_hints_from_compacted_history(marketool_declarations.clone(),ContextualUserFragment::into(crate::context::GuardianApprovedAction::new("parent-private-release".to_owned())),ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -3207,6 +3227,8 @@ async fn spawn_agent_fork_strips_parent_usage_hints_from_compacted_history(markeContextualUserFragment::into(catalog_role("Catalog parent root guidance.")),parent_task.to_model_input_item(),ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "developer".to_string(),content: vec![ContentItem::InputText {@@ -3221,6 +3243,8 @@ async fn spawn_agent_fork_strips_parent_usage_hints_from_compacted_history(marke),},ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "developer".to_string(),content: vec![@@ -3451,6 +3475,8 @@ async fn spawn_agent_full_fork_restores_instructions_after_compaction_discards_plet parent_spawn_call_id = "spawn-call-compacted-stale-instructions".to_string();let replacement_history = vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -3460,6 +3486,8 @@ async fn spawn_agent_full_fork_restores_instructions_after_compaction_discards_pinternal_chat_message_metadata_passthrough: None,},ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "developer".to_string(),content: vec![ContentItem::InputText {@@ -3483,6 +3511,8 @@ async fn spawn_agent_full_fork_restores_instructions_after_compaction_discards_p.session.persist_rollout_items(&[rollout_response_item(ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "developer".to_string(),content: vec![ContentItem::InputText {@@ -3636,6 +3666,8 @@ async fn spawn_agent_full_fork_legacy_compaction_rebuilds_child_instructions_oncNone => "spawn-call-legacy-compact-without-parent",};let parent_user_message = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -3683,6 +3715,8 @@ async fn spawn_agent_full_fork_legacy_compaction_rebuilds_child_instructions_onc];if let Some(instructions) = parent_developer_instructions {rollout_items.push(rollout_response_item(ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "developer".to_string(),content: vec![ContentItem::InputText {@@ -3693,6 +3727,8 @@ async fn spawn_agent_full_fork_legacy_compaction_rebuilds_child_instructions_onc}));}rollout_items.push(rollout_response_item(ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "developer".to_string(),content: vec![ContentItem::InputText {diff --git a/codex-rs/core/src/client.rs b/codex-rs/core/src/client.rsindex 085a6bd52f..ab83a91a61 100644--- a/codex-rs/core/src/client.rs+++ b/codex-rs/core/src/client.rs@@ -213,6 +213,7 @@ struct ModelClientState {include_timing_metrics: bool,beta_features_header: Option<String>,concurrent_reasoning_summaries_enabled: bool,+ output_token_replay_enabled: bool,include_attestation: bool,attestation_provider: Option<Arc<dyn AttestationProvider>>,disable_websockets: AtomicBool,@@ -547,6 +548,7 @@ impl ModelClient {include_timing_metrics: bool,beta_features_header: Option<String>,concurrent_reasoning_summaries_enabled: bool,+ output_token_replay_enabled: bool,attestation_provider: Option<Arc<dyn AttestationProvider>>,http_client_factory: HttpClientFactory,workspace_routing: WorkspaceRoutingContext,@@ -585,6 +587,7 @@ impl ModelClient {include_timing_metrics,beta_features_header,concurrent_reasoning_summaries_enabled,+ output_token_replay_enabled,include_attestation,attestation_provider,disable_websockets: AtomicBool::new(false),@@ -999,6 +1002,14 @@ impl ModelClient {if !is_openai {for item in &mut input {item.clear_internal_chat_message_metadata_passthrough();+ if !matches!(+ item,+ ResponseItem::Reasoning { .. }+ | ResponseItem::Compaction { .. }+ | ResponseItem::ContextCompaction { .. }+ ) {+ item.clear_encrypted_content();+ }if let ResponseItem::FunctionCall {encrypted_function_args,..@@ -1015,7 +1026,10 @@ impl ModelClient {.then_some(StreamOptions {reasoning_summary_delivery: codex_api::ReasoningSummaryDelivery::SequentialCutoff,});- let include = vec!["reasoning.encrypted_content".to_string()];+ let mut include = vec!["reasoning.encrypted_content".to_string()];+ if self.state.output_token_replay_enabled && is_openai {+ include.push("output.encrypted_content".to_string());+ }let verbosity = if model_info.support_verbosity {self.state.model_verbosity.or(model_info.default_verbosity)} else {diff --git a/codex-rs/core/src/client_common_tests.rs b/codex-rs/core/src/client_common_tests.rsindex 5af77bec75..e4f431ad45 100644--- a/codex-rs/core/src/client_common_tests.rs+++ b/codex-rs/core/src/client_common_tests.rs@@ -21,6 +21,8 @@ fn prompt_with_image_outputs(detail: Option<ImageDetail>) -> Prompt {Prompt {input: vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![diff --git a/codex-rs/core/src/client_tests.rs b/codex-rs/core/src/client_tests.rsindex 42e546e8f8..46ac895307 100644--- a/codex-rs/core/src/client_tests.rs+++ b/codex-rs/core/src/client_tests.rs@@ -130,6 +130,7 @@ fn test_model_client_with_thread_id(/*include_timing_metrics*/ false,/*beta_features_header*/ None,/*concurrent_reasoning_summaries_enabled*/ false,+ /*output_token_replay_enabled*/ false,/*attestation_provider*/ None,HttpClientFactory::new(OutboundProxyPolicy::ReqwestDefault),codex_model_provider::WorkspaceRoutingContext::new(@@ -1434,9 +1435,13 @@ fn started_inference_attempt(temp: &TempDir) -> anyhow::Result<InferenceTraceAttfn output_message(id: &str, text: &str) -> ResponseItem {ResponseItem::Message {+ status: None,+ encrypted_content: None,id: Some(codex_protocol::ResponseItemId::with_suffix("msg", id)),role: "assistant".to_string(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: text.to_string(),}],phase: None,@@ -2020,6 +2025,7 @@ fn model_client_with_counting_attestation(/*include_timing_metrics*/ false,/*beta_features_header*/ None,/*concurrent_reasoning_summaries_enabled*/ false,+ /*output_token_replay_enabled*/ false,Some(Arc::new(CountingAttestationProvider {calls: attestation_calls.clone(),})),diff --git a/codex-rs/core/src/codex_delegate_tests.rs b/codex-rs/core/src/codex_delegate_tests.rsindex a89fcc4e46..9288d30001 100644--- a/codex-rs/core/src/codex_delegate_tests.rs+++ b/codex-rs/core/src/codex_delegate_tests.rs@@ -90,6 +90,7 @@ async fn forward_events_filters_private_events_before_blocked_send_is_cancelled(}let visible_msg = EventMsg::RawResponseItem(RawResponseItemEvent {item: ResponseItem::CustomToolCall {+ encrypted_content: None,id: None,status: None,call_id: "call-1".to_string(),diff --git a/codex-rs/core/src/compact.rs b/codex-rs/core/src/compact.rsindex f4db71b688..ac94dee097 100644--- a/codex-rs/core/src/compact.rs+++ b/codex-rs/core/src/compact.rs@@ -538,7 +538,7 @@ pub fn content_items_to_text(content: &[ContentItem]) -> Option<String> {let mut pieces = Vec::new();for item in content {match item {- ContentItem::InputText { text } | ContentItem::OutputText { text } => {+ ContentItem::InputText { text } | ContentItem::OutputText { text, .. } => {if !text.is_empty() {pieces.push(text.as_str());}@@ -733,6 +733,8 @@ fn build_compacted_history_with_limit(}selected_messages.push(ResponseItemEnvelope {item: ResponseItem::Message {+ status: None,+ encrypted_content: None,id: id.clone(),role: "user".to_owned(),content,diff --git a/codex-rs/core/src/compact_remote_v2.rs b/codex-rs/core/src/compact_remote_v2.rsindex 6a061086b1..8c38c2b41f 100644--- a/codex-rs/core/src/compact_remote_v2.rs+++ b/codex-rs/core/src/compact_remote_v2.rs@@ -719,7 +719,7 @@ fn message_text_token_count(item: &ResponseItem) -> usize {content.iter().map(|item| match item {- ContentItem::InputText { text } | ContentItem::OutputText { text } => {+ ContentItem::InputText { text } | ContentItem::OutputText { text, .. } => {approx_token_count(text)}ContentItem::InputImage { .. } | ContentItem::InputAudio { .. } => 0,@@ -737,7 +737,7 @@ fn truncate_message_text_to_token_budget(let mut truncated_content = Vec::with_capacity(content.len());for mut content_item in content {match content_item.content_mut() {- ContentItem::InputText { text } | ContentItem::OutputText { text } => {+ ContentItem::InputText { text } | ContentItem::OutputText { text, .. } => {if remaining == 0 {continue;}@@ -783,6 +783,8 @@ mod tests {fn message(role: &str, text: &str, phase: Option<MessagePhase>) -> ResponseItem {ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: role.to_string(),content: vec![ContentItem::InputText {@@ -854,6 +856,8 @@ mod tests {message("assistant", "commentary", Some(MessagePhase::Commentary)),message("assistant", "final", Some(MessagePhase::FinalAnswer)),ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,name: "shell_command".to_string(),namespace: None,@@ -990,6 +994,8 @@ mod tests {#[test]fn build_v2_compacted_history_counts_retained_input_images() {let input = vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![@@ -1039,6 +1045,8 @@ mod tests {truncated,vec![ResponseItem::Message {+ encrypted_content: None,+ status: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -1060,6 +1068,8 @@ mod tests {#[test]fn retained_history_truncation_preserves_images_and_truncates_later_text_parts() {let item = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![@@ -1073,6 +1083,8 @@ mod tests {detail: None,},ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: "uvwxyz".to_string(),},ContentItem::InputText {@@ -1130,6 +1142,8 @@ mod tests {assert_eq!(truncated,vec![ResponseItem::Message {+ encrypted_content: None,+ status: None,id: None,role: "user".to_string(),content: vec![@@ -1143,6 +1157,8 @@ mod tests {detail: None,},ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: "uv…1 tokens truncated…yz".to_string(),},ContentItem::InputImage {@@ -1172,6 +1188,8 @@ mod tests {#[test]fn retained_history_truncation_charges_image_only_messages() {let image_only_message = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputImage {@@ -1198,6 +1216,8 @@ mod tests {#[test]fn retained_history_truncation_drops_image_only_messages_after_budget_is_spent() {let image_only_message = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputImage {diff --git a/codex-rs/core/src/compact_remote_v2_image_budget_tests.rs b/codex-rs/core/src/compact_remote_v2_image_budget_tests.rsindex ea37694606..a4db94d5e1 100644--- a/codex-rs/core/src/compact_remote_v2_image_budget_tests.rs+++ b/codex-rs/core/src/compact_remote_v2_image_budget_tests.rs@@ -8,6 +8,8 @@ use pretty_assertions::assert_eq;fn message(content: Vec<ContentItem>) -> ResponseItem {ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content,diff --git a/codex-rs/core/src/compact_remote_v2_images.rs b/codex-rs/core/src/compact_remote_v2_images.rsindex e1ae5be0fa..cd8697813a 100644--- a/codex-rs/core/src/compact_remote_v2_images.rs+++ b/codex-rs/core/src/compact_remote_v2_images.rs@@ -14,7 +14,7 @@ use codex_utils_output_truncation::truncate_text;pub(super) fn content_item_token_count(item: &ContentItem) -> usize {match item {- ContentItem::InputText { text } | ContentItem::OutputText { text } => {+ ContentItem::InputText { text } | ContentItem::OutputText { text, .. } => {approx_token_count(text)}ContentItem::InputImage { image, detail } => usize::try_from(@@ -72,7 +72,7 @@ pub(super) fn truncate_message_to_token_budget(}let mut item = content.pop()?;match item.content_mut() {- ContentItem::InputText { text } | ContentItem::OutputText { text } => {+ ContentItem::InputText { text } | ContentItem::OutputText { text, .. } => {if remaining == 0 {continue;}diff --git a/codex-rs/core/src/compact_tests.rs b/codex-rs/core/src/compact_tests.rsindex 28051a77c3..2b5f93c69e 100644--- a/codex-rs/core/src/compact_tests.rs+++ b/codex-rs/core/src/compact_tests.rs@@ -53,6 +53,8 @@ async fn local_compaction_respects_tool_metadata_state(let arguments = json!({"plan": [{"step": "x".repeat(7 * 1024), "status": "completed"}]});assert!(serde_json::to_vec(&arguments)?.len() < 8 * 1024);items.push(ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,name: "update_plan".to_string(),namespace: None,@@ -222,6 +224,8 @@ fn raw(items: Vec<ResponseItemEnvelope>) -> Vec<ResponseItem> {fn user_message(text: &str) -> ResponseItem {ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -247,9 +251,13 @@ fn content_items_to_text_joins_non_empty_segments() {text: "hello".to_string(),},ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: String::new(),},ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: "world".to_string(),},];@@ -277,15 +285,21 @@ fn content_items_to_text_ignores_image_only_content() {fn collect_user_messages_extracts_user_text_only() {let items = vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: Some(ResponseItemId::with_suffix("msg", "assistant")),role: "assistant".to_string(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: "ignored".to_string(),}],phase: None,internal_chat_message_metadata_passthrough: None,},ResponseItem::Message {+ status: None,+ encrypted_content: None,id: Some(ResponseItemId::with_suffix("msg", "user")),role: "user".to_string(),content: vec![ContentItem::InputText {@@ -370,6 +384,8 @@ fn collect_annotated_user_messages_extracts_user_text_only(fn collect_user_messages_filters_session_prefix_entries() {let items = vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -384,6 +400,8 @@ do thingsinternal_chat_message_metadata_passthrough: None,},ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -393,6 +411,8 @@ do thingsinternal_chat_message_metadata_passthrough: None,},ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -538,6 +558,8 @@ fn build_compacted_history_preserves_user_message_passthrough_metadata() {vec![ResponseItemEnvelope {item: ResponseItem::Message {+ encrypted_content: None,+ status: None,id: Some(ResponseItemId::with_suffix("msg", "user")),role: "user".to_string(),content: vec![ContentItem::InputText {@@ -579,6 +601,8 @@ fn assemble_compaction_history_keeps_prefix_first_and_summary_last() {};let compacted_history = vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -588,6 +612,8 @@ fn assemble_compaction_history_keeps_prefix_first_and_summary_last() {internal_chat_message_metadata_passthrough: None,},ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -598,6 +624,8 @@ fn assemble_compaction_history_keeps_prefix_first_and_summary_last() {},agent_completion.clone(),ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -608,6 +636,8 @@ fn assemble_compaction_history_keeps_prefix_first_and_summary_last() {},];let initial_context = vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "developer".to_string(),content: vec![ContentItem::InputText {@@ -625,6 +655,8 @@ fn assemble_compaction_history_keeps_prefix_first_and_summary_last() {let expected = vec![prefix,ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -634,6 +666,8 @@ fn assemble_compaction_history_keeps_prefix_first_and_summary_last() {internal_chat_message_metadata_passthrough: None,},ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "developer".to_string(),content: vec![ContentItem::InputText {@@ -643,6 +677,8 @@ fn assemble_compaction_history_keeps_prefix_first_and_summary_last() {internal_chat_message_metadata_passthrough: None,},ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -653,6 +689,8 @@ fn assemble_compaction_history_keeps_prefix_first_and_summary_last() {},agent_completion,ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -683,6 +721,8 @@ fn assemble_compaction_history_keeps_compaction_last() {},];let initial_context = vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "developer".to_string(),content: vec![ContentItem::InputText {@@ -699,6 +739,8 @@ fn assemble_compaction_history_keeps_compaction_last() {));let expected = vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "developer".to_string(),content: vec![ContentItem::InputText {diff --git a/codex-rs/core/src/context/world_state/world_state_tests.rs b/codex-rs/core/src/context/world_state/world_state_tests.rsindex a5ceddc775..8e9769394b 100644--- a/codex-rs/core/src/context/world_state/world_state_tests.rs+++ b/codex-rs/core/src/context/world_state/world_state_tests.rs@@ -244,6 +244,8 @@ fn missing_retained_fragment_is_rendered_again() {);let previous = world_state.render_full().0;let retained = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "developer".to_string(),content: vec![ContentItem::InputText {diff --git a/codex-rs/core/src/context_manager/history.rs b/codex-rs/core/src/context_manager/history.rsindex 9988b1810d..890d9ee9d2 100644--- a/codex-rs/core/src/context_manager/history.rs+++ b/codex-rs/core/src/context_manager/history.rs@@ -356,7 +356,9 @@ impl ContextManager {.iter().filter_map(|content| match content {ContentItem::InputText { text }- | ContentItem::OutputText { text } => Some(text.as_str()),+ | ContentItem::OutputText { text, .. } => {+ Some(text.as_str())+ }_ => None,}).collect::<Vec<_>>()@@ -1100,7 +1102,7 @@ fn estimate_response_item_model_visible_bytes(item: &ResponseItem) -> i64 {ResponseItem::Message { content, .. } => content.iter().map(|part| match part {- ContentItem::InputText { text } | ContentItem::OutputText { text } => {+ ContentItem::InputText { text } | ContentItem::OutputText { text, .. } => {text_bytes(text)}ContentItem::InputImage { image, detail } => {diff --git a/codex-rs/core/src/context_manager/history_tests.rs b/codex-rs/core/src/context_manager/history_tests.rsindex e363460ec7..0a06b09fbc 100644--- a/codex-rs/core/src/context_manager/history_tests.rs+++ b/codex-rs/core/src/context_manager/history_tests.rs@@ -85,9 +85,13 @@ fn pcm_wav_data_url(sample_count: u32) -> (String, usize) {fn assistant_msg(text: &str) -> ResponseItem {ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "assistant".to_string(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: text.to_string(),}],phase: None,@@ -104,9 +108,13 @@ fn inter_agent_assistant_msg(text: &str) -> ResponseItem {/*trigger_turn*/ true,);ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "assistant".to_string(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: serde_json::to_string(&communication).unwrap(),}],phase: None,@@ -651,9 +659,13 @@ fn world_state_reconciles_matching_legacy_history_once() {fn user_msg(text: &str) -> ResponseItem {ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: text.to_string(),}],phase: None,@@ -663,6 +675,8 @@ fn user_msg(text: &str) -> ResponseItem {fn user_input_text_msg(text: &str) -> ResponseItem {ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -675,6 +689,8 @@ fn user_input_text_msg(text: &str) -> ResponseItem {fn developer_msg(text: &str) -> ResponseItem {ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "developer".to_string(),content: vec![ContentItem::InputText {@@ -687,6 +703,8 @@ fn developer_msg(text: &str) -> ResponseItem {fn developer_msg_with_fragments(texts: &[&str]) -> ResponseItem {ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "developer".to_string(),content: texts@@ -781,9 +799,13 @@ fn filters_non_api_messages() {let policy = TruncationPolicy::Tokens(10_000);// System message is not API messages; Other is ignored.let system = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "system".to_string(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: "ignored".to_string(),}],phase: None,@@ -828,6 +850,8 @@ fn retains_only_harness_authored_configuration_updates() {},ResponseItemEnvelope {item: ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "system".to_string(),content: vec![ContentItem::InputText {@@ -1055,6 +1079,8 @@ fn record_annotated_items_preserves_metadata_while_processing_item(fn for_prompt_annotated_preserves_metadata_while_normalizing_item() {let envelope = ResponseItemEnvelope {item: ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![@@ -1138,6 +1164,8 @@ fn total_token_usage_includes_all_items_after_last_model_generated_item() {fn for_prompt_strips_media_when_model_does_not_support_it() {let items = vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![@@ -1171,6 +1199,8 @@ fn for_prompt_strips_media_when_model_does_not_support_it() {),},ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,name: "view_image".to_string(),namespace: None,@@ -1201,6 +1231,7 @@ fn for_prompt_strips_media_when_model_does_not_support_it() {internal_chat_message_metadata_passthrough: None,},ResponseItem::CustomToolCall {+ encrypted_content: None,id: None,status: None,call_id: "tool-1".to_string(),@@ -1237,6 +1268,8 @@ fn for_prompt_strips_media_when_model_does_not_support_it() {let expected = vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![@@ -1269,6 +1302,8 @@ fn for_prompt_strips_media_when_model_does_not_support_it() {),},ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,name: "view_image".to_string(),namespace: None,@@ -1298,6 +1333,7 @@ fn for_prompt_strips_media_when_model_does_not_support_it() {internal_chat_message_metadata_passthrough: None,},ResponseItem::CustomToolCall {+ encrypted_content: None,id: None,status: None,call_id: "tool-1".to_string(),@@ -1339,6 +1375,8 @@ fn for_prompt_strips_media_when_model_does_not_support_it() {// With image support, images are preservedlet modalities = default_input_modalities();let with_images = create_history_with_items(vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![@@ -1365,6 +1403,8 @@ fn for_prompt_strips_media_when_model_does_not_support_it() {}let audio_message = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputAudio {@@ -1384,6 +1424,7 @@ fn for_prompt_strips_media_when_model_does_not_support_it() {fn for_prompt_preserves_image_generation_calls_when_images_are_supported() {let history = create_history_with_items(vec![ResponseItem::ImageGenerationCall {+ encrypted_content: None,id: Some(ResponseItemId::with_suffix("ig", "123")),status: "generating".to_string(),revised_prompt: Some("lobster".to_string()),@@ -1391,6 +1432,8 @@ fn for_prompt_preserves_image_generation_calls_when_images_are_supported() {internal_chat_message_metadata_passthrough: None,},ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -1405,6 +1448,7 @@ fn for_prompt_preserves_image_generation_calls_when_images_are_supported() {history.for_prompt(&default_input_modalities()),vec![ResponseItem::ImageGenerationCall {+ encrypted_content: None,id: Some(ResponseItemId::with_suffix("ig", "123")),status: "generating".to_string(),revised_prompt: Some("lobster".to_string()),@@ -1412,6 +1456,8 @@ fn for_prompt_preserves_image_generation_calls_when_images_are_supported() {internal_chat_message_metadata_passthrough: None,},ResponseItem::Message {+ encrypted_content: None,+ status: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -1428,6 +1474,8 @@ fn for_prompt_preserves_image_generation_calls_when_images_are_supported() {fn for_prompt_clears_image_generation_result_when_images_are_unsupported() {let history = create_history_with_items(vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -1437,6 +1485,7 @@ fn for_prompt_clears_image_generation_result_when_images_are_unsupported() {internal_chat_message_metadata_passthrough: None,},ResponseItem::ImageGenerationCall {+ encrypted_content: None,id: Some(ResponseItemId::with_suffix("ig", "123")),status: "completed".to_string(),revised_prompt: Some("lobster".to_string()),@@ -1449,6 +1498,8 @@ fn for_prompt_clears_image_generation_result_when_images_are_unsupported() {history.for_prompt(&[InputModality::Text]),vec![ResponseItem::Message {+ encrypted_content: None,+ status: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -1458,6 +1509,7 @@ fn for_prompt_clears_image_generation_result_when_images_are_unsupported() {internal_chat_message_metadata_passthrough: Some(unknown_content_metadata()),},ResponseItem::ImageGenerationCall {+ encrypted_content: None,id: Some(ResponseItemId::with_suffix("ig", "123")),status: "completed".to_string(),revised_prompt: Some("lobster".to_string()),@@ -1514,6 +1566,8 @@ fn estimate_token_count_counts_recorded_base_instructions_once() {fn remove_first_item_removes_matching_output_for_function_call() {let items = vec![ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,name: "do_it".to_string(),namespace: None,@@ -1548,6 +1602,8 @@ fn remove_first_item_removes_matching_call_for_output() {internal_chat_message_metadata_passthrough: None,},ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,name: "do_it".to_string(),namespace: None,@@ -1566,6 +1622,7 @@ fn remove_first_item_removes_matching_call_for_output() {fn remove_first_item_handles_local_shell_pair() {let items = vec![ResponseItem::LocalShellCall {+ encrypted_content: None,id: None,call_id: Some("call-3".to_string()),status: LocalShellStatus::Completed,@@ -1652,6 +1709,8 @@ fn drop_last_n_user_turns_preserves_prefix() {("steer", "Check the tests too."),] {let message = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: Some(ResponseItemId::with_suffix("msg", id)),role: "user".to_owned(),content: vec![ContentItem::InputText {@@ -1880,6 +1939,8 @@ fn drop_last_n_user_turns_preserves_annotations_for_surviving_developer_fragmentlet turn_id = "rolled-back-turn";let model_switch = ModelSwitchInstructions::new("switched model instructions").render();let developer_message = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "developer".to_string(),content: vec![@@ -1916,6 +1977,8 @@ fn drop_last_n_user_turns_preserves_annotations_for_surviving_developer_fragmentassert_eq!(raw_items(&history),vec![ResponseItem::Message {+ encrypted_content: None,+ status: None,id: None,role: "developer".to_string(),content: vec![@@ -2003,6 +2066,7 @@ fn drop_last_n_user_turns_clears_reference_context_for_mixed_developer_context_bfn remove_first_item_handles_custom_tool_pair() {let items = vec![ResponseItem::CustomToolCall {+ encrypted_content: None,id: None,status: None,call_id: "tool-1".to_string(),@@ -2028,6 +2092,7 @@ fn remove_first_item_handles_custom_tool_pair() {fn normalization_retains_local_shell_outputs() {let items = vec![ResponseItem::LocalShellCall {+ encrypted_content: None,id: None,call_id: Some("shell-1".to_string()),status: LocalShellStatus::Completed,@@ -2263,6 +2328,7 @@ fn format_exec_output_prefers_line_marker_when_both_limits_exceeded() {#[test_case::test_case(true; "inherited")]fn normalize_adds_missing_output_for_custom_tool_call(inherited: bool) {let items = vec![ResponseItem::CustomToolCall {+ encrypted_content: None,id: None,status: None,call_id: "tool-x".to_string(),@@ -2283,6 +2349,7 @@ fn normalize_adds_missing_output_for_custom_tool_call(inherited: bool) {raw_items(&h),vec![ResponseItem::CustomToolCall {+ encrypted_content: None,id: None,status: None,call_id: "tool-x".to_string(),@@ -2306,6 +2373,7 @@ fn normalize_adds_missing_output_for_custom_tool_call(inherited: bool) {#[test_case::test_case(true; "inherited")]fn normalize_adds_missing_output_for_local_shell_call_with_id(inherited: bool) {let items = vec![ResponseItem::LocalShellCall {+ encrypted_content: None,id: None,call_id: Some("shell-1".to_string()),status: LocalShellStatus::Completed,@@ -2330,6 +2398,7 @@ fn normalize_adds_missing_output_for_local_shell_call_with_id(inherited: bool) {raw_items(&h),vec![ResponseItem::LocalShellCall {+ encrypted_content: None,id: None,call_id: Some("shell-1".to_string()),status: LocalShellStatus::Completed,@@ -2395,6 +2464,8 @@ fn normalize_mixed_inserts_and_removals() {let items = vec![// Will get an inserted outputResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,name: "f1".to_string(),namespace: None,@@ -2414,6 +2485,7 @@ fn normalize_mixed_inserts_and_removals() {},// Will get an inserted custom tool outputResponseItem::CustomToolCall {+ encrypted_content: None,id: None,status: None,call_id: "t1".to_string(),@@ -2424,6 +2496,7 @@ fn normalize_mixed_inserts_and_removals() {},// Local shell call also gets an inserted function call outputResponseItem::LocalShellCall {+ encrypted_content: None,id: None,call_id: Some("s1".to_string()),status: LocalShellStatus::Completed,@@ -2445,6 +2518,8 @@ fn normalize_mixed_inserts_and_removals() {raw_items(&h),vec![ResponseItem::FunctionCall {+ encrypted_content: None,+ status: None,id: None,name: "f1".to_string(),namespace: None,@@ -2462,6 +2537,7 @@ fn normalize_mixed_inserts_and_removals() {internal_chat_message_metadata_passthrough: None,},ResponseItem::CustomToolCall {+ encrypted_content: None,id: None,status: None,call_id: "t1".to_string(),@@ -2478,6 +2554,7 @@ fn normalize_mixed_inserts_and_removals() {internal_chat_message_metadata_passthrough: None,},ResponseItem::LocalShellCall {+ encrypted_content: None,id: None,call_id: Some("s1".to_string()),status: LocalShellStatus::Completed,@@ -2505,6 +2582,8 @@ fn normalize_mixed_inserts_and_removals() {#[test]fn normalize_adds_missing_output_for_function_call_inserts_output() {let items = vec![ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,name: "do_it".to_string(),namespace: None,@@ -2519,6 +2598,8 @@ fn normalize_adds_missing_output_for_function_call_inserts_output() {raw_items(&h),vec![ResponseItem::FunctionCall {+ encrypted_content: None,+ status: None,id: None,name: "do_it".to_string(),namespace: None,@@ -2558,6 +2639,8 @@ fn normalize_preserves_named_function_call_output_without_call_id() {fn for_prompt_assigns_stable_id_to_synthetic_output_without_reordering_history() {let items = vec![ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: Some(ResponseItemId::with_suffix("fc", "existing")),name: "do_it".to_string(),namespace: None,@@ -2567,6 +2650,8 @@ fn for_prompt_assigns_stable_id_to_synthetic_output_without_reordering_history()internal_chat_message_metadata_passthrough: None,},ResponseItem::Message {+ status: None,+ encrypted_content: None,id: Some(ResponseItemId::with_suffix("msg", "later")),role: "user".to_string(),content: vec![ContentItem::InputText {@@ -2601,6 +2686,7 @@ fn for_prompt_assigns_stable_id_to_synthetic_output_without_reordering_history()#[test]fn normalize_adds_missing_output_for_tool_search_call() {let items = vec![ResponseItem::ToolSearchCall {+ encrypted_content: None,id: None,call_id: Some("search-call-x".to_string()),status: Some("completed".to_string()),@@ -2616,6 +2702,7 @@ fn normalize_adds_missing_output_for_tool_search_call() {raw_items(&h),vec![ResponseItem::ToolSearchCall {+ encrypted_content: None,id: None,call_id: Some("search-call-x".to_string()),status: Some("completed".to_string()),@@ -2640,6 +2727,7 @@ fn normalize_adds_missing_output_for_tool_search_call() {#[should_panic]fn normalize_adds_missing_output_for_custom_tool_call_panics_in_debug() {let items = vec![ResponseItem::CustomToolCall {+ encrypted_content: None,id: None,status: None,call_id: "tool-x".to_string(),@@ -2657,6 +2745,7 @@ fn normalize_adds_missing_output_for_custom_tool_call_panics_in_debug() {#[should_panic]fn normalize_adds_missing_output_for_local_shell_call_with_id_panics_in_debug() {let items = vec![ResponseItem::LocalShellCall {+ encrypted_content: None,id: None,call_id: Some("shell-1".to_string()),status: LocalShellStatus::Completed,@@ -2771,6 +2860,8 @@ fn normalize_keeps_server_tool_search_output_without_matching_call() {fn normalize_mixed_inserts_and_removals_panics_in_debug() {let items = vec![ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,name: "f1".to_string(),namespace: None,@@ -2788,6 +2879,7 @@ fn normalize_mixed_inserts_and_removals_panics_in_debug() {internal_chat_message_metadata_passthrough: None,},ResponseItem::CustomToolCall {+ encrypted_content: None,id: None,status: None,call_id: "t1".to_string(),@@ -2797,6 +2889,7 @@ fn normalize_mixed_inserts_and_removals_panics_in_debug() {internal_chat_message_metadata_passthrough: None,},ResponseItem::LocalShellCall {+ encrypted_content: None,id: None,call_id: Some("s1".to_string()),status: LocalShellStatus::Completed,@@ -2819,6 +2912,8 @@ fn image_data_url_payload_does_not_dominate_message_estimate() {let payload = "A".repeat(100_000);let image_url = format!("data:image/png;base64,{payload}");let image_item = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![@@ -2834,6 +2929,8 @@ fn image_data_url_payload_does_not_dominate_message_estimate() {internal_chat_message_metadata_passthrough: None,};let text_only_item = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -2857,6 +2954,8 @@ fn image_data_url_payload_does_not_dominate_message_estimate() {#[test]fn file_images_use_detail_appropriate_estimates() {let item = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![@@ -2956,6 +3055,8 @@ fn image_data_url_payload_does_not_dominate_custom_tool_call_output_estimate() {fn audio_data_url_payload_does_not_dominate_message_estimate() {let (audio_url, _) = pcm_wav_data_url(/*sample_count*/ 801);let item = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputAudio { audio_url }],@@ -3021,6 +3122,8 @@ fn malformed_audio_data_url_falls_back_to_whole_url_size_cost() {let audio_url = format!("data:audio/wav;base64,{payload}");let fallback_bytes = approx_bytes_for_tokens(approx_token_count(&audio_url)) as i64;let item = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputAudio { audio_url }],@@ -3076,6 +3179,8 @@ fn record_items_omits_audio_that_exceeds_the_output_budget() {#[test]fn non_base64_image_urls_use_image_estimates() {let message_item = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputImage {@@ -3198,6 +3303,8 @@ fn encrypted_function_output_uses_plaintext_byte_estimate() {#[test]fn data_url_without_base64_marker_uses_image_estimate() {let item = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputImage {@@ -3246,6 +3353,8 @@ fn mixed_case_data_url_markers_are_adjusted() {let payload = "F".repeat(1_024);let image_url = format!("DATA:image/png;BASE64,{payload}");let item = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputImage {@@ -3269,6 +3378,8 @@ fn multiple_inline_images_apply_multiple_fixed_costs() {let image_url_one = format!("data:image/png;base64,{payload_one}");let image_url_two = format!("data:image/jpeg;base64,{payload_two}");let item = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![@@ -3405,9 +3516,13 @@ fn original_detail_webp_images_scale_with_dimensions() {#[test]fn text_only_items_count_decoded_content() {let item = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "assistant".to_string(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: "Hello, \"world\"!\nこんにちは".to_string(),}],phase: None,diff --git a/codex-rs/core/src/context_manager/history_user_authorization.rs b/codex-rs/core/src/context_manager/history_user_authorization.rsindex 1a2fafcd93..3d0f72b1f8 100644--- a/codex-rs/core/src/context_manager/history_user_authorization.rs+++ b/codex-rs/core/src/context_manager/history_user_authorization.rs@@ -173,7 +173,7 @@ impl ContextManager {let text = content.iter().filter_map(|content| match content {- ContentItem::InputText { text } | ContentItem::OutputText { text } => {+ ContentItem::InputText { text } | ContentItem::OutputText { text, .. } => {Some(text.as_str())}_ => {diff --git a/codex-rs/core/src/context_manager/updates.rs b/codex-rs/core/src/context_manager/updates.rsindex 576d546849..1052d92d9a 100644--- a/codex-rs/core/src/context_manager/updates.rs+++ b/codex-rs/core/src/context_manager/updates.rs@@ -16,6 +16,8 @@ pub(crate) fn build_rendered_message(fragments: Vec<RenderedFragment>) -> Option.unzip();Some(ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: role.to_string(),content,diff --git a/codex-rs/core/src/context_manager/updates_tests.rs b/codex-rs/core/src/context_manager/updates_tests.rsindex 026058bbdf..50472118bc 100644--- a/codex-rs/core/src/context_manager/updates_tests.rs+++ b/codex-rs/core/src/context_manager/updates_tests.rs@@ -45,6 +45,8 @@ fn fragment(role: &'static str, text: &'static str) -> TestFragment {fn message(role: &str, texts: &[&str]) -> ResponseItem {ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: role.to_string(),content: textsdiff --git a/codex-rs/core/src/event_mapping.rs b/codex-rs/core/src/event_mapping.rsindex 176e33da17..c0fe8308fa 100644--- a/codex-rs/core/src/event_mapping.rs+++ b/codex-rs/core/src/event_mapping.rs@@ -137,7 +137,7 @@ fn parse_user_message(message: &[ContentItem]) -> Option<UserMessageItem> {audio_url: audio_url.clone(),});}- ContentItem::OutputText { text } => {+ ContentItem::OutputText { text, .. } => {warn!("Output text in user message: {}", text);}}@@ -154,7 +154,7 @@ fn parse_agent_message(let mut content: Vec<AgentMessageContent> = Vec::new();for content_item in message.iter() {match content_item {- ContentItem::InputText { text } | ContentItem::OutputText { text } => {+ ContentItem::InputText { text } | ContentItem::OutputText { text, .. } => {content.push(AgentMessageContent::Text { text: text.clone() });}_ => {diff --git a/codex-rs/core/src/event_mapping_tests.rs b/codex-rs/core/src/event_mapping_tests.rsindex d6d9f59f2c..853f652691 100644--- a/codex-rs/core/src/event_mapping_tests.rs+++ b/codex-rs/core/src/event_mapping_tests.rs@@ -77,6 +77,8 @@ fn parses_user_message_with_text_and_two_images() {let img2 = "https://example.com/two.jpg".to_string();let item = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![@@ -128,6 +130,8 @@ fn parses_user_message_with_text_and_two_images() {#[test]fn parses_user_message_with_file_image() {let item = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![@@ -174,6 +178,8 @@ fn skips_local_image_label_text() {let user_text = "Please review this image.".to_string();let item = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![@@ -222,6 +228,8 @@ fn skips_local_audio_label_text() {let user_text = "Please transcribe this audio.".to_string();let item = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![@@ -262,6 +270,8 @@ fn skips_local_audio_label_text() {#[test]fn parses_assistant_message_input_text_for_backward_compatibility() {let item = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "assistant".to_string(),content: vec![ContentItem::InputText {@@ -303,6 +313,8 @@ fn skips_unnamed_image_label_text() {let user_text = "Please review this image.".to_string();let item = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![@@ -348,6 +360,8 @@ fn skips_unnamed_image_label_text() {fn skips_user_instructions_and_env() {let items = vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -356,6 +370,8 @@ fn skips_user_instructions_and_env() {phase: None,internal_chat_message_metadata_passthrough: None,},ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -364,6 +380,8 @@ fn skips_user_instructions_and_env() {phase: None,internal_chat_message_metadata_passthrough: None,},ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -372,6 +390,8 @@ fn skips_user_instructions_and_env() {phase: None,internal_chat_message_metadata_passthrough: None,},ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -381,6 +401,8 @@ fn skips_user_instructions_and_env() {phase: None,internal_chat_message_metadata_passthrough: None,},ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -389,6 +411,8 @@ fn skips_user_instructions_and_env() {phase: None,internal_chat_message_metadata_passthrough: None,},ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![@@ -439,6 +463,8 @@ fn parses_hook_prompt_message_as_distinct_turn_item() {#[test]fn parses_hook_prompt_and_hides_other_contextual_fragments() {let item = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: Some(ResponseItemId::with_suffix("msg", "1")),role: "user".to_string(),content: vec![@@ -474,6 +500,8 @@ fn parses_hook_prompt_and_hides_other_contextual_fragments() {#[test]fn internal_model_context_does_not_parse_as_visible_turn_item() {let item = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: Some(ResponseItemId::with_suffix("msg", "1")),role: "user".to_string(),content: vec![ContentItem::InputText {@@ -493,9 +521,13 @@ fn internal_model_context_does_not_parse_as_visible_turn_item() {#[test]fn parses_agent_message() {let item = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: Some(ResponseItemId::with_suffix("msg", "1")),role: "assistant".to_string(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: "Hello from Codex".to_string(),}],phase: None,@@ -584,6 +616,7 @@ fn parses_reasoning_including_raw_content() {#[test]fn parses_web_search_call() {let item = ResponseItem::WebSearchCall {+ encrypted_content: None,id: Some(ResponseItemId::with_suffix("ws", "1")),status: Some("completed".to_string()),action: Some(WebSearchAction::Search {@@ -615,6 +648,7 @@ fn parses_web_search_call() {#[test]fn parses_web_search_open_page_call() {let item = ResponseItem::WebSearchCall {+ encrypted_content: None,id: Some(ResponseItemId::with_suffix("ws", "open")),status: Some("completed".to_string()),action: Some(WebSearchAction::OpenPage {@@ -644,6 +678,7 @@ fn parses_web_search_open_page_call() {#[test]fn parses_web_search_find_in_page_call() {let item = ResponseItem::WebSearchCall {+ encrypted_content: None,id: Some(ResponseItemId::with_suffix("ws", "find")),status: Some("completed".to_string()),action: Some(WebSearchAction::FindInPage {@@ -675,6 +710,7 @@ fn parses_web_search_find_in_page_call() {#[test]fn parses_partial_web_search_call_without_action_as_other() {let item = ResponseItem::WebSearchCall {+ encrypted_content: None,id: Some(ResponseItemId::with_suffix("ws", "partial")),status: Some("in_progress".to_string()),action: None,diff --git a/codex-rs/core/src/guardian/tests.rs b/codex-rs/core/src/guardian/tests.rsindex 3644e42cde..f1bb71163e 100644--- a/codex-rs/core/src/guardian/tests.rs+++ b/codex-rs/core/src/guardian/tests.rs@@ -254,6 +254,8 @@ async fn seed_guardian_parent_history(session: &Arc<Session>, turn: &Arc<TurnConturn.model_info(),&[ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -264,6 +266,8 @@ async fn seed_guardian_parent_history(session: &Arc<Session>, turn: &Arc<TurnConinternal_chat_message_metadata_passthrough: None,},ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,name: "gh_repo_view".to_string(),namespace: None,@@ -283,9 +287,13 @@ async fn seed_guardian_parent_history(session: &Arc<Session>, turn: &Arc<TurnConinternal_chat_message_metadata_passthrough: None,},ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "assistant".to_string(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: "The repo is public; I now need approval to push the docs fix.".to_string(),}],@@ -302,7 +310,9 @@ fn response_item_contains_message_text(item: &ResponseItem, needle: &str) -> booreturn false;};content.iter().any(|item| match item {- ContentItem::InputText { text } | ContentItem::OutputText { text } => text.contains(needle),+ ContentItem::InputText { text } | ContentItem::OutputText { text, .. } => {+ text.contains(needle)+ }ContentItem::InputImage { .. } | ContentItem::InputAudio { .. } => false,})}@@ -775,6 +785,8 @@ async fn build_guardian_prompt_delta_mode_preserves_original_numbering() -> anyhturn.model_info(),&[ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -784,9 +796,13 @@ async fn build_guardian_prompt_delta_mode_preserves_original_numbering() -> anyhinternal_chat_message_metadata_passthrough: None,},ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "assistant".to_string(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: "I need approval for the second push.".to_string(),}],phase: None,@@ -916,6 +932,8 @@ async fn build_guardian_prompt_stale_delta_version_falls_back_to_full_prompt() -.replace_history(vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -925,9 +943,13 @@ async fn build_guardian_prompt_stale_delta_version_falls_back_to_full_prompt() -internal_chat_message_metadata_passthrough: None,},ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "assistant".to_string(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: "Compacted summary of earlier guardian context.".to_string(),}],phase: None,@@ -943,6 +965,8 @@ async fn build_guardian_prompt_stale_delta_version_falls_back_to_full_prompt() -turn.model_info(),&[ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -952,9 +976,13 @@ async fn build_guardian_prompt_stale_delta_version_falls_back_to_full_prompt() -internal_chat_message_metadata_passthrough: None,},ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "assistant".to_string(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: "I need approval for the post-compaction push.".to_string(),}],phase: None,@@ -1021,6 +1049,8 @@ fn collect_guardian_transcript_entries(fn collect_guardian_transcript_entries_skips_contextual_user_messages() {let items = vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -1030,9 +1060,13 @@ fn collect_guardian_transcript_entries_skips_contextual_user_messages() {internal_chat_message_metadata_passthrough: None,},ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "assistant".to_string(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: "hello".to_string(),}],phase: None,@@ -1058,6 +1092,8 @@ fn collect_guardian_transcript_entries_skips_contextual_user_messages() {fn collect_guardian_transcript_entries_includes_recent_tool_calls_and_output() {let mut items = vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -1067,6 +1103,8 @@ fn collect_guardian_transcript_entries_includes_recent_tool_calls_and_output() {internal_chat_message_metadata_passthrough: None,},ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,name: "read_file".to_string(),namespace: None,@@ -1086,9 +1124,13 @@ fn collect_guardian_transcript_entries_includes_recent_tool_calls_and_output() {internal_chat_message_metadata_passthrough: None,},ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "assistant".to_string(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: "I need to push a fix".to_string(),}],phase: None,@@ -1762,6 +1804,8 @@ fn build_guardian_transcript_reserves_separate_budget_for_tool_evidence() {].into_iter().map(|(role, text)| ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: role.to_string(),content: vec![ContentItem::InputText {@@ -1772,6 +1816,8 @@ fn build_guardian_transcript_reserves_separate_budget_for_tool_evidence() {}).collect::<Vec<_>>();items.extend((0..12).map(|index| ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,name: format!("tool_{index}"),namespace: None,@@ -1815,6 +1861,8 @@ fn build_guardian_transcript_preserves_recent_tool_context_when_user_history_is_let repeated = "authorization ".repeat(6_000);let mut items = (0..8).map(|_| ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -1826,6 +1874,8 @@ fn build_guardian_transcript_preserves_recent_tool_context_when_user_history_is_.collect::<Vec<_>>();items.extend([ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,name: "shell".to_string(),namespace: None,@@ -2269,6 +2319,8 @@ async fn guardian_review_request_layout_matches_model_visible_request_snapshot()turn.as_ref(),turn.model_info(),&[ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -2555,6 +2607,8 @@ async fn guardian_reuses_prompt_cache_key_and_appends_prior_reviews() -> anyhow:turn.model_info(),&[ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -2564,9 +2618,13 @@ async fn guardian_reuses_prompt_cache_key_and_appends_prior_reviews() -> anyhow:internal_chat_message_metadata_passthrough: None,},ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "assistant".to_string(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: "I need approval for the second docs fix.".to_string(),}],phase: None,@@ -2642,6 +2700,8 @@ async fn guardian_reuses_prompt_cache_key_and_appends_prior_reviews() -> anyhow:internal_chat_message_metadata_passthrough: None,},ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -2651,9 +2711,13 @@ async fn guardian_reuses_prompt_cache_key_and_appends_prior_reviews() -> anyhow:internal_chat_message_metadata_passthrough: None,},ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "assistant".to_string(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: "I need approval for the third docs fix.".to_string(),}],phase: None,@@ -2702,6 +2766,8 @@ async fn guardian_reuses_prompt_cache_key_and_appends_prior_reviews() -> anyhow:session.replace_history(vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -3632,6 +3698,8 @@ async fn guardian_ephemeral_retry_preserves_parallel_trunk_and_fork_history() ->turn.as_ref(), turn.model_info(),&[ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -3640,9 +3708,13 @@ async fn guardian_ephemeral_retry_preserves_parallel_trunk_and_fork_history() ->phase: None,internal_chat_message_metadata_passthrough: None,},ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "assistant".to_string(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: "I need approval to run git diff.".to_string(),}],phase: None,@@ -3709,6 +3781,8 @@ async fn guardian_ephemeral_retry_preserves_parallel_trunk_and_fork_history() ->turn.as_ref(), turn.model_info(),&[ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -3717,9 +3791,13 @@ async fn guardian_ephemeral_retry_preserves_parallel_trunk_and_fork_history() ->phase: None,internal_chat_message_metadata_passthrough: None,},ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "assistant".to_string(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: "I need approval to push after the diff check.".to_string(),}],phase: None,diff --git a/codex-rs/core/src/image_preparation_tests.rs b/codex-rs/core/src/image_preparation_tests.rsindex 3bee21f152..f890b48e20 100644--- a/codex-rs/core/src/image_preparation_tests.rs+++ b/codex-rs/core/src/image_preparation_tests.rs@@ -67,6 +67,8 @@ fn decoded_image(image_url: &str) -> (Vec<u8>, DynamicImage) {async fn preparation_preserves_small_image_bytes_and_replaces_remote_urls() {let (data_url, original_bytes) = png_data_url(/*width*/ 64, /*height*/ 32);let mut items = vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![@@ -87,6 +89,8 @@ async fn preparation_preserves_small_image_bytes_and_replaces_remote_urls() {internal_chat_message_metadata_passthrough: None,}];items.push(ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "developer".to_string(),content: vec![ContentItem::InputImage {@@ -127,6 +131,8 @@ async fn preparation_preserves_small_image_bytes_and_replaces_remote_urls() {assert_eq!(&items[1],&ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "developer".to_string(),content: vec![ContentItem::InputText {@@ -176,6 +182,8 @@ async fn detail_policies_apply_the_expected_budgets() {] {let (image_url, _) = png_data_url(input_dimensions.0, input_dimensions.1);let mut items = vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputImage {@@ -269,6 +277,8 @@ async fn preparation_reports_tool_output_item_id() {async fn upload_failure_keeps_resized_image_inline() {let (image_url, _) = png_data_url(/*width*/ 2048, /*height*/ 2048);let mut items = vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputImage {@@ -311,6 +321,8 @@ async fn resize_notices_count_file_backed_images_and_skip_failed_images() {let (small_image_url, _) = png_data_url(/*width*/ 64, /*height*/ 32);let mut items = vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![@@ -456,6 +468,8 @@ async fn resize_notices_count_file_backed_images_and_skip_failed_images() {assert_eq!(&items[1],&ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "developer".to_string(),content: vec![ContentItem::InputText {@@ -504,6 +518,8 @@ async fn resize_notices_count_file_backed_images_and_skip_failed_images() {assert_eq!(&items[3],&ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "developer".to_string(),content: vec![ContentItem::InputText {diff --git a/codex-rs/core/src/realtime_context_tests.rs b/codex-rs/core/src/realtime_context_tests.rsindex b1519e6c1e..fb34e8ecf8 100644--- a/codex-rs/core/src/realtime_context_tests.rs+++ b/codex-rs/core/src/realtime_context_tests.rs@@ -81,6 +81,8 @@ fn stored_thread(cwd: &str, title: &str, first_user_message: &str) -> StoredThrefn message(role: &str, content: ContentItem) -> ResponseItem {ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: role.to_string(),content: vec![content],@@ -94,7 +96,14 @@ fn user_message(text: impl Into<String>) -> ResponseItem {}fn assistant_message(text: impl Into<String>) -> ResponseItem {- message("assistant", ContentItem::OutputText { text: text.into() })+ message(+ "assistant",+ ContentItem::OutputText {+ annotations: None,+ logprobs: None,+ text: text.into(),+ },+ )}fn long_turn_text(index: usize) -> String {diff --git a/codex-rs/core/src/session/rollout_reconstruction_tests.rs b/codex-rs/core/src/session/rollout_reconstruction_tests.rsindex 879115d3d0..21463d873c 100644--- a/codex-rs/core/src/session/rollout_reconstruction_tests.rs+++ b/codex-rs/core/src/session/rollout_reconstruction_tests.rs@@ -204,6 +204,8 @@ macro_rules! object {fn user_message(text: &str) -> ResponseItem {ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -216,9 +218,13 @@ fn user_message(text: &str) -> ResponseItem {fn assistant_message(text: &str) -> ResponseItem {ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "assistant".to_string(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: text.to_string(),}],phase: None,@@ -239,9 +245,13 @@ fn inter_agent_assistant_message(text: &str) -> ResponseItem {/*trigger_turn*/ true,);ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "assistant".to_string(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: serde_json::to_string(&communication).unwrap(),}],phase: None,diff --git a/codex-rs/core/src/session/session.rs b/codex-rs/core/src/session/session.rsindex 3d944cb9bd..5cd89a8672 100644--- a/codex-rs/core/src/session/session.rs+++ b/codex-rs/core/src/session/session.rs@@ -1776,6 +1776,7 @@ impl Session {config.features.enabled(Feature::ConcurrentReasoningSummaries),+ config.features.enabled(Feature::OutputTokenReplay),attestation_provider,config.http_client_factory(),workspace_routing.as_ref().clone(),diff --git a/codex-rs/core/src/session/tests.rs b/codex-rs/core/src/session/tests.rsindex b43aac549e..e77d26239b 100644--- a/codex-rs/core/src/session/tests.rs+++ b/codex-rs/core/src/session/tests.rs@@ -322,6 +322,8 @@ mod guardian_tests;fn user_message(text: &str) -> ResponseItem {ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -391,9 +393,13 @@ async fn default_turn_context_assigns_missing_response_item_ids() {fn assistant_message(text: &str) -> ResponseItem {ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "assistant".to_string(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: text.to_string(),}],phase: None,@@ -589,6 +595,8 @@ async fn world_state_extension_metrics_follow_turn_model_switch() {fn skill_message(text: &str) -> ResponseItem {ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -853,6 +861,7 @@ fn test_model_client_session() -> crate::client::ModelClientSession {/*include_timing_metrics*/ false,/*beta_features_header*/ None,/*concurrent_reasoning_summaries_enabled*/ false,+ /*output_token_replay_enabled*/ false,/*attestation_provider*/ None,HttpClientFactory::new(OutboundProxyPolicy::ReqwestDefault),codex_model_provider::WorkspaceRoutingContext::new(@@ -2426,6 +2435,8 @@ async fn reconstruct_history_matches_live_compactions() {async fn reconstruct_history_uses_replacement_history_verbatim() {let (session, turn_context) = make_session_and_context().await;let summary_item = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -2443,6 +2454,8 @@ async fn reconstruct_history_uses_replacement_history_verbatim() {metadata: Some(CodexHarnessMetadata::default()),},ResponseItemEnvelope::new(ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "developer".to_string(),content: vec![ContentItem::InputText {@@ -3095,6 +3108,8 @@ async fn prepares_image_failures_before_history_insertion() {async fn prepares_resumed_history_before_installing_it() {let (session, _turn_context) = make_session_and_context().await;let resumed_item = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![@@ -3134,6 +3149,8 @@ async fn prepares_resumed_history_before_installing_it() {assert_eq!(raw_history_items(&history),vec![ResponseItem::Message {+ encrypted_content: None,+ status: None,id: None,role: "user".to_string(),content: vec![@@ -4114,6 +4131,8 @@ async fn record_initial_history_assigns_and_persists_id_for_forked_response_itemlet response_item =ContextualUserFragment::into(DeveloperInstructions::new("Subagent guidance."));let mut expected_item = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "developer".to_string(),content: vec![ContentItem::InputText {@@ -6907,6 +6926,7 @@ pub(crate) async fn make_session_and_context() -> (Session, TurnContext) {config.features.enabled(Feature::ConcurrentReasoningSummaries),+ /*output_token_replay_enabled*/ false,/*attestation_provider*/ None,config.http_client_factory(),config.workspace_routing_context(),@@ -9174,6 +9194,7 @@ whereconfig.features.enabled(Feature::ConcurrentReasoningSummaries),+ /*output_token_replay_enabled*/ false,/*attestation_provider*/ None,config.http_client_factory(),config.workspace_routing_context(),@@ -11135,6 +11156,8 @@ async fn record_context_updates_and_set_reference_context_item_reinjects_full_colet turn_context = Arc::new(turn_context);let step_context = StepContext::for_test(Arc::clone(&turn_context));let compacted_summary = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -12479,6 +12502,8 @@ async fn task_finish_emits_turn_item_lifecycle_for_leftover_pending_user_input()let history = sess.clone_history().await;let expected = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![@@ -12663,6 +12688,8 @@ async fn thread_idle_lifecycle_waits_for_trigger_turn_mailbox_work() {async fn abort_empty_active_turn_preserves_pending_input() {let (sess, _tc, _rx) = make_session_and_context_with_rx().await;let pending_item = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -13003,6 +13030,8 @@ async fn tool_calls_reopen_mailbox_delivery_for_current_turn() {.await;let item = ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,name: "test_tool".to_string(),namespace: None,@@ -13122,6 +13151,7 @@ async fn fatal_tool_error_stops_turn_and_reports_error() {&Default::default(),);let item = ResponseItem::CustomToolCall {+ encrypted_content: None,id: None,status: None,call_id: "call-1".to_string(),diff --git a/codex-rs/core/src/session/turn.rs b/codex-rs/core/src/session/turn.rsindex 632bb1a294..35cf4d6ef5 100644--- a/codex-rs/core/src/session/turn.rs+++ b/codex-rs/core/src/session/turn.rs@@ -2321,7 +2321,7 @@ async fn maybe_complete_plan_item_from_message({let mut text = String::new();for entry in content {- if let ContentItem::OutputText { text: chunk } = entry {+ if let ContentItem::OutputText { text: chunk, .. } = entry {text.push_str(chunk);}}diff --git a/codex-rs/core/src/session/turn_input_tests.rs b/codex-rs/core/src/session/turn_input_tests.rsindex 7fb4c7564c..ee5c646483 100644--- a/codex-rs/core/src/session/turn_input_tests.rs+++ b/codex-rs/core/src/session/turn_input_tests.rs@@ -64,6 +64,8 @@ impl SessionTask for NeverEndingTask {fn user_message(text: &str) -> ResponseItem {ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {diff --git a/codex-rs/core/src/session/turn_tests.rs b/codex-rs/core/src/session/turn_tests.rsindex 85d8fac511..c1554d79c0 100644--- a/codex-rs/core/src/session/turn_tests.rs+++ b/codex-rs/core/src/session/turn_tests.rs@@ -29,9 +29,13 @@ impl TurnItemContributor for RewriteAgentMessageContributor {fn assistant_output_text(text: &str) -> ResponseItem {ResponseItem::Message {+ status: None,+ encrypted_content: None,id: Some(ResponseItemId::with_suffix("msg", "1")),role: "assistant".to_string(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: text.to_string(),}],phase: None,diff --git a/codex-rs/core/src/stream_events_utils.rs b/codex-rs/core/src/stream_events_utils.rsindex d1e2b06be5..2081c42cd2 100644--- a/codex-rs/core/src/stream_events_utils.rs+++ b/codex-rs/core/src/stream_events_utils.rs@@ -66,7 +66,7 @@ pub(crate) fn raw_assistant_output_text_from_item(item: &ResponseItem) -> Optionlet combined = content.iter().filter_map(|ci| match ci {- codex_protocol::models::ContentItem::OutputText { text } => Some(text.as_str()),+ codex_protocol::models::ContentItem::OutputText { text, .. } => Some(text.as_str()),_ => None,}).collect::<String>();diff --git a/codex-rs/core/src/stream_events_utils_tests.rs b/codex-rs/core/src/stream_events_utils_tests.rsindex 53b20da436..daad318bb2 100644--- a/codex-rs/core/src/stream_events_utils_tests.rs+++ b/codex-rs/core/src/stream_events_utils_tests.rs@@ -41,9 +41,13 @@ fn assistant_output_text(text: &str) -> ResponseItem {fn assistant_output_text_with_phase(text: &str, phase: Option<MessagePhase>) -> ResponseItem {ResponseItem::Message {+ status: None,+ encrypted_content: None,id: Some(ResponseItemId::with_suffix("msg", "1")),role: "assistant".to_string(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: text.to_string(),}],phase,@@ -55,12 +59,14 @@ fn assistant_output_text_with_phase(text: &str, phase: Option<MessagePhase>) ->fn external_context_pollution_items_include_web_search_and_tool_search() {let polluting_items = [ResponseItem::WebSearchCall {+ encrypted_content: None,id: None,status: Some("completed".to_string()),action: None,internal_chat_message_metadata_passthrough: None,},ResponseItem::ToolSearchCall {+ encrypted_content: None,id: None,call_id: Some("search-1".to_string()),status: None,@@ -97,6 +103,7 @@ fn external_context_pollution_items_include_web_search_and_tool_search() {fn external_context_pollution_items_exclude_local_tool_calls() {let non_polluting_items = [ResponseItem::LocalShellCall {+ encrypted_content: None,id: None,call_id: Some("shell-1".to_string()),status: LocalShellStatus::Completed,@@ -110,6 +117,8 @@ fn external_context_pollution_items_exclude_local_tool_calls() {internal_chat_message_metadata_passthrough: None,},ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,name: "shell".to_string(),namespace: None,@@ -127,6 +136,7 @@ fn external_context_pollution_items_exclude_local_tool_calls() {internal_chat_message_metadata_passthrough: None,},ResponseItem::CustomToolCall {+ encrypted_content: None,id: None,status: None,call_id: "custom-1".to_string(),diff --git a/codex-rs/core/src/tasks/review.rs b/codex-rs/core/src/tasks/review.rsindex 2435922219..7d9bf760a8 100644--- a/codex-rs/core/src/tasks/review.rs+++ b/codex-rs/core/src/tasks/review.rs@@ -240,6 +240,8 @@ pub(crate) async fn exit_review_mode(&ctx,ctx.model_info(),&[ResponseItem::Message {+ status: None,+ encrypted_content: None,id: Some(ResponseItemId::new("msg")),role: "user".to_string(),content: vec![ContentItem::InputText { text: user_message }],@@ -260,9 +262,13 @@ pub(crate) async fn exit_review_mode(ctx.as_ref(),ctx.model_info(),ResponseItem::Message {+ status: None,+ encrypted_content: None,id: Some(ResponseItemId::new("msg")),role: "assistant".to_string(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: assistant_message,}],phase: None,diff --git a/codex-rs/core/src/thread_manager_tests.rs b/codex-rs/core/src/thread_manager_tests.rsindex b587d03a99..df585fa7d9 100644--- a/codex-rs/core/src/thread_manager_tests.rs+++ b/codex-rs/core/src/thread_manager_tests.rs@@ -582,9 +582,13 @@ impl codex_agent_graph_store::AgentGraphStore for FakeAgentGraphStore {fn user_msg(text: &str) -> ResponseItem {ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: text.to_string(),}],phase: None,@@ -593,9 +597,13 @@ fn user_msg(text: &str) -> ResponseItem {}fn assistant_msg(text: &str) -> ResponseItem {ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "assistant".to_string(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: text.to_string(),}],phase: None,@@ -696,6 +704,8 @@ fn truncates_before_requested_user_message() {internal_chat_message_metadata_passthrough: None,},ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,call_id: "c1".to_string(),name: "tool".to_string(),@@ -3060,6 +3070,8 @@ fn multi_agent_v2_interrupted_marker_uses_developer_input_message() {assert_eq!(developer_interrupted_marker(),ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "developer".to_string(),content: vec![ContentItem::InputText {diff --git a/codex-rs/core/src/thread_rollout_truncation_tests.rs b/codex-rs/core/src/thread_rollout_truncation_tests.rsindex cf034dff79..a6ee1d1296 100644--- a/codex-rs/core/src/thread_rollout_truncation_tests.rs+++ b/codex-rs/core/src/thread_rollout_truncation_tests.rs@@ -19,9 +19,13 @@ fn response_item(item: ResponseItem) -> RolloutItem {fn user_msg(text: &str) -> ResponseItem {ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: text.to_string(),}],phase: None,@@ -31,9 +35,13 @@ fn user_msg(text: &str) -> ResponseItem {fn assistant_msg(text: &str) -> ResponseItem {ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "assistant".to_string(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: text.to_string(),}],phase: None,@@ -245,6 +253,8 @@ fn truncates_rollout_from_start_before_nth_user_only() {internal_chat_message_metadata_passthrough: None,},ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,call_id: "c1".to_string(),name: "tool".to_string(),diff --git a/codex-rs/core/src/tools/executed_tool_calls/mcp_attribution_tests.rs b/codex-rs/core/src/tools/executed_tool_calls/mcp_attribution_tests.rsindex 8d90927ddc..9085d18a43 100644--- a/codex-rs/core/src/tools/executed_tool_calls/mcp_attribution_tests.rs+++ b/codex-rs/core/src/tools/executed_tool_calls/mcp_attribution_tests.rs@@ -20,6 +20,8 @@ fn source(tool_name: &str, first_turn_id: &str) -> McpAttributionSource {fn envelope(attribution: Option<McpAttribution>) -> ResponseItemEnvelope {ResponseItemEnvelope {item: ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: Vec::new(),diff --git a/codex-rs/core/src/tools/handlers/extension_tools.rs b/codex-rs/core/src/tools/handlers/extension_tools.rsindex ea483528d0..d6eeb84616 100644--- a/codex-rs/core/src/tools/handlers/extension_tools.rs+++ b/codex-rs/core/src/tools/handlers/extension_tools.rs@@ -435,6 +435,8 @@ mod tests {.map(|environment| environment.cwd().clone()).collect::<Vec<_>>();let history_item = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {diff --git a/codex-rs/core/src/tools/handlers/multi_agents_tests.rs b/codex-rs/core/src/tools/handlers/multi_agents_tests.rsindex 6991af1476..f6ffb7a8bb 100644--- a/codex-rs/core/src/tools/handlers/multi_agents_tests.rs+++ b/codex-rs/core/src/tools/handlers/multi_agents_tests.rs@@ -2804,6 +2804,8 @@ async fn resume_agent_restores_closed_agent_and_accepts_send_input() {config.clone(),InitialHistory::Forked(vec![RolloutItem::ResponseItem(ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {diff --git a/codex-rs/core/src/tools/router_tests.rs b/codex-rs/core/src/tools/router_tests.rsindex 379209bc7b..aff6d41660 100644--- a/codex-rs/core/src/tools/router_tests.rs+++ b/codex-rs/core/src/tools/router_tests.rs@@ -212,6 +212,8 @@ async fn build_tool_call_uses_namespace_for_registry_name() -> anyhow::Result<()let tool_name = "create_event".to_string();let call = ToolRouter::build_tool_call(ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,name: tool_name.clone(),namespace: Some("mcp__codex_apps__calendar".to_string()),@@ -244,6 +246,7 @@ async fn build_custom_tool_call_uses_namespace_for_registry_name() -> anyhow::Relet tool_name = "exec".to_string();let call = ToolRouter::build_tool_call(ResponseItem::CustomToolCall {+ encrypted_content: None,id: None,status: None,call_id: "call-namespace".to_string(),@@ -273,6 +276,8 @@ async fn build_custom_tool_call_uses_namespace_for_registry_name() -> anyhow::Refn build_tool_call_normalizes_default_function_and_custom_namespaces() -> anyhow::Result<()> {for namespace in [None, Some(""), Some(DEFAULT_FUNCTION_NAMESPACE)] {let function_call = ToolRouter::build_tool_call(ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,name: "lookup".to_string(),namespace: namespace.map(str::to_string),@@ -283,6 +288,7 @@ fn build_tool_call_normalizes_default_function_and_custom_namespaces() -> anyhow})?.expect("function_call should produce a tool call");let custom_call = ToolRouter::build_tool_call(ResponseItem::CustomToolCall {+ encrypted_content: None,id: None,status: None,call_id: "call-custom".to_string(),@@ -535,6 +541,8 @@ async fn extension_tool_executors_are_model_visible_and_dispatchable() -> anyhowlet turn = Arc::new(turn);let step_context = StepContext::for_test(Arc::clone(&turn));let history_item = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -581,6 +589,8 @@ async fn extension_tool_executors_are_model_visible_and_dispatchable() -> anyhow);let call = ToolRouter::build_tool_call(ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,name: "echo".to_string(),namespace: Some("extension/".to_string()),diff --git a/codex-rs/core/src/turn_timing_tests.rs b/codex-rs/core/src/turn_timing_tests.rsindex 65185ecea2..7aa7d3d177 100644--- a/codex-rs/core/src/turn_timing_tests.rs+++ b/codex-rs/core/src/turn_timing_tests.rs@@ -149,6 +149,8 @@ async fn turn_timing_state_preserves_in_flight_items_after_turn_completion() {fn response_item_records_turn_ttft_for_first_output_signals() {assert!(response_item_records_turn_ttft(&ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,name: "shell".to_string(),namespace: None,@@ -160,6 +162,7 @@ fn response_item_records_turn_ttft_for_first_output_signals() {));assert!(response_item_records_turn_ttft(&ResponseItem::CustomToolCall {+ encrypted_content: None,id: None,status: None,call_id: "call-2".to_string(),@@ -170,9 +173,13 @@ fn response_item_records_turn_ttft_for_first_output_signals() {}));assert!(response_item_records_turn_ttft(&ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "assistant".to_string(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: "hello".to_string(),}],phase: None,@@ -183,9 +190,13 @@ fn response_item_records_turn_ttft_for_first_output_signals() {#[test]fn response_item_records_turn_ttft_ignores_empty_non_output_items() {assert!(!response_item_records_turn_ttft(&ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "assistant".to_string(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: String::new(),}],phase: None,diff --git a/codex-rs/core/tests/common/responses.rs b/codex-rs/core/tests/common/responses.rsindex de8507feb2..645b423c56 100644--- a/codex-rs/core/tests/common/responses.rs+++ b/codex-rs/core/tests/common/responses.rs@@ -832,6 +832,8 @@ pub fn ev_assistant_message(id: &str, text: &str) -> Value {pub fn user_message_item(text: &str) -> ResponseItem {ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {diff --git a/codex-rs/core/tests/responses_headers.rs b/codex-rs/core/tests/responses_headers.rsindex 84bf461e78..74b52a3cac 100644--- a/codex-rs/core/tests/responses_headers.rs+++ b/codex-rs/core/tests/responses_headers.rs@@ -139,6 +139,7 @@ async fn responses_stream_includes_subagent_header_on_review() {/*include_timing_metrics*/ false,/*beta_features_header*/ None,/*concurrent_reasoning_summaries_enabled*/ false,+ /*output_token_replay_enabled*/ false,/*attestation_provider*/ None,config.http_client_factory(),config.workspace_routing_context(),@@ -149,6 +150,8 @@ async fn responses_stream_includes_subagent_header_on_review() {let mut prompt = Prompt::default();prompt.input = vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".into(),content: vec![ContentItem::InputText {@@ -283,6 +286,7 @@ async fn responses_stream_includes_subagent_header_on_other() {/*include_timing_metrics*/ false,/*beta_features_header*/ None,/*concurrent_reasoning_summaries_enabled*/ false,+ /*output_token_replay_enabled*/ false,/*attestation_provider*/ None,config.http_client_factory(),config.workspace_routing_context(),@@ -293,6 +297,8 @@ async fn responses_stream_includes_subagent_header_on_other() {let mut prompt = Prompt::default();prompt.input = vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".into(),content: vec![ContentItem::InputText {@@ -412,6 +418,7 @@ async fn responses_respects_model_info_overrides_from_config() {/*include_timing_metrics*/ false,/*beta_features_header*/ None,/*concurrent_reasoning_summaries_enabled*/ false,+ /*output_token_replay_enabled*/ false,/*attestation_provider*/ None,config.http_client_factory(),config.workspace_routing_context(),@@ -422,6 +429,8 @@ async fn responses_respects_model_info_overrides_from_config() {let mut prompt = Prompt::default();prompt.input = vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".into(),content: vec![ContentItem::InputText {diff --git a/codex-rs/core/tests/suite/client.rs b/codex-rs/core/tests/suite/client.rsindex 23e2f115f7..b79a2b0d17 100644--- a/codex-rs/core/tests/suite/client.rs+++ b/codex-rs/core/tests/suite/client.rs@@ -692,6 +692,8 @@ async fn synthetic_call_output_id_is_stable_across_resumes() -> anyhow::Result<(timestamp: "2024-01-01T00:00:01.000Z".to_string(),ordinal: None,item: rollout_response_item(ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: Some(ResponseItemId::with_suffix("fc", "existing")),name: "do_it".to_string(),namespace: None,@@ -988,6 +990,8 @@ async fn resume_sends_prior_items() {// Prior item: user message (should be delivered)let prior_user = codex_protocol::models::ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![codex_protocol::models::ContentItem::InputText {@@ -1010,9 +1014,13 @@ async fn resume_sends_prior_items() {// Prior item: system message (excluded from API history)let prior_system = codex_protocol::models::ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "system".to_string(),content: vec![codex_protocol::models::ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: "resumed system instruction".to_string(),}],phase: None,@@ -1032,9 +1040,13 @@ async fn resume_sends_prior_items() {// Prior item: assistant messagelet prior_item = codex_protocol::models::ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "assistant".to_string(),content: vec![codex_protocol::models::ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: "resumed assistant message".to_string(),}],phase: Some(MessagePhase::Commentary),@@ -1160,6 +1172,7 @@ async fn resume_replays_legacy_js_repl_image_rollout_shapes() {// Current image tests cover today's shapes; this keeps resume compatibility for that// legacy rollout representation.let legacy_custom_tool_call = ResponseItem::CustomToolCall {+ encrypted_content: None,id: None,status: None,call_id: "legacy-js-call".to_string(),@@ -1209,6 +1222,8 @@ async fn resume_replays_legacy_js_repl_image_rollout_shapes() {timestamp: "2024-01-01T00:00:03.000Z".to_string(),ordinal: None,item: rollout_response_item(ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputImage {@@ -1335,6 +1350,8 @@ async fn resume_replays_image_tool_outputs_with_detail() {timestamp: "2024-01-01T00:00:01.000Z".to_string(),ordinal: None,item: rollout_response_item(ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,name: "view_image".to_string(),namespace: None,@@ -1367,6 +1384,7 @@ async fn resume_replays_image_tool_outputs_with_detail() {timestamp: "2024-01-01T00:00:02.000Z".to_string(),ordinal: None,item: rollout_response_item(ResponseItem::CustomToolCall {+ encrypted_content: None,id: None,status: Some("completed".to_string()),call_id: custom_call_id.to_string(),@@ -1752,6 +1770,7 @@ async fn send_request_with_provider(provider: ModelProviderInfo) {config.features.enabled(Feature::ConcurrentReasoningSummaries),+ /*output_token_replay_enabled*/ false,/*attestation_provider*/ None,config.http_client_factory(),config.workspace_routing_context(),@@ -1772,6 +1791,8 @@ async fn send_request_with_provider(provider: ModelProviderInfo) {}let mut prompt = Prompt::default();prompt.input.push(ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -3247,6 +3268,7 @@ async fn azure_responses_request_does_not_store_and_preserves_prefixed_item_ids(/*include_timing_metrics*/ false,/*beta_features_header*/ None,/*concurrent_reasoning_summaries_enabled*/ false,+ /*output_token_replay_enabled*/ false,/*attestation_provider*/ None,config.http_client_factory(),config.workspace_routing_context(),@@ -3268,15 +3290,20 @@ async fn azure_responses_request_does_not_store_and_preserves_prefixed_item_ids(internal_chat_message_metadata_passthrough: None,});prompt.input.push(ResponseItem::Message {+ status: None,+ encrypted_content: None,id: Some(ResponseItemId::with_suffix("msg", "message-id")),role: "assistant".into(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: "message".into(),}],phase: None,internal_chat_message_metadata_passthrough: None,});prompt.input.push(ResponseItem::WebSearchCall {+ encrypted_content: None,id: Some(ResponseItemId::with_suffix("ws", "web-search-id")),status: Some("completed".into()),action: Some(WebSearchAction::Search {@@ -3286,6 +3313,8 @@ async fn azure_responses_request_does_not_store_and_preserves_prefixed_item_ids(internal_chat_message_metadata_passthrough: None,});prompt.input.push(ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: Some(ResponseItemId::with_suffix("fc", "function-id")),name: "do_thing".into(),namespace: None,@@ -3303,6 +3332,7 @@ async fn azure_responses_request_does_not_store_and_preserves_prefixed_item_ids(internal_chat_message_metadata_passthrough: None,});prompt.input.push(ResponseItem::LocalShellCall {+ encrypted_content: None,id: Some(ResponseItemId::with_suffix("lsh", "local-shell-id")),call_id: Some("local-shell-call-id".into()),status: LocalShellStatus::Completed,@@ -3316,6 +3346,7 @@ async fn azure_responses_request_does_not_store_and_preserves_prefixed_item_ids(internal_chat_message_metadata_passthrough: None,});prompt.input.push(ResponseItem::CustomToolCall {+ encrypted_content: None,id: Some(ResponseItemId::with_suffix("ctc", "custom-tool-id")),status: Some("completed".into()),call_id: "custom-tool-call-id".into(),diff --git a/codex-rs/core/tests/suite/client_websockets.rs b/codex-rs/core/tests/suite/client_websockets.rsindex 80532652c3..288b8e208b 100755--- a/codex-rs/core/tests/suite/client_websockets.rs+++ b/codex-rs/core/tests/suite/client_websockets.rs@@ -2661,6 +2661,8 @@ async fn responses_websocket_v2_sets_openai_beta_header() {fn message_item(text: &str) -> ResponseItem {ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".into(),content: vec![ContentItem::InputText { text: text.into() }],@@ -2671,9 +2673,15 @@ fn message_item(text: &str) -> ResponseItem {fn assistant_message_item(id: &str, text: &str) -> ResponseItem {ResponseItem::Message {+ status: None,+ encrypted_content: None,id: Some(ResponseItemId::with_suffix("msg", id)),role: "assistant".into(),- content: vec![ContentItem::OutputText { text: text.into() }],+ content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,+ text: text.into(),+ }],phase: None,internal_chat_message_metadata_passthrough: None,}@@ -2870,6 +2878,7 @@ async fn websocket_harness_with_provider_options_and_auth(config.features.enabled(Feature::ConcurrentReasoningSummaries),+ config.features.enabled(Feature::OutputTokenReplay),/*attestation_provider*/ None,http_client_factory,config.workspace_routing_context(),diff --git a/codex-rs/core/tests/suite/compact_remote.rs b/codex-rs/core/tests/suite/compact_remote.rsindex 76032f34ef..a77b923e7e 100644--- a/codex-rs/core/tests/suite/compact_remote.rs+++ b/codex-rs/core/tests/suite/compact_remote.rs@@ -367,6 +367,8 @@ async fn remote_compact_v2_retains_only_client_developer_messages_when_enabled().await?;let developer = |text: &str| ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "developer".to_string(),content: vec![ContentItem::InputText {diff --git a/codex-rs/core/tests/suite/guardian_context_budget.rs b/codex-rs/core/tests/suite/guardian_context_budget.rsindex 6f770f70f4..0e8be264e9 100644--- a/codex-rs/core/tests/suite/guardian_context_budget.rs+++ b/codex-rs/core/tests/suite/guardian_context_budget.rs@@ -148,6 +148,8 @@ async fn independent_review_preserves_oversized_instruction_order() -> Result<().inject_response_items(vec![responses::user_message_item(&followup),ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "developer".to_owned(),content: vec![ContentItem::InputText {diff --git a/codex-rs/core/tests/suite/guardian_review.rs b/codex-rs/core/tests/suite/guardian_review.rsindex f3bf78d8a2..77f980f43b 100644--- a/codex-rs/core/tests/suite/guardian_review.rs+++ b/codex-rs/core/tests/suite/guardian_review.rs@@ -2261,7 +2261,7 @@ async fn guardian_denial_rejects_tool_call_with_rationale(assert!(recorded_history.iter().any(|item| {matches!(item, ResponseItem::Message { role, content, .. }if role == "assistant" && content.iter().any(|part| {- matches!(part, ContentItem::OutputText { text }+ matches!(part, ContentItem::OutputText { text , .. }if Some(text.as_str()) == record["decision"].as_str())}))}));diff --git a/codex-rs/core/tests/suite/guardian_subagent_authorization.rs b/codex-rs/core/tests/suite/guardian_subagent_authorization.rsindex 20ec6eddf2..96beaeff19 100644--- a/codex-rs/core/tests/suite/guardian_subagent_authorization.rs+++ b/codex-rs/core/tests/suite/guardian_subagent_authorization.rs@@ -1016,6 +1016,8 @@ async fn run_guardian_subagent_review(].into_iter().map(|text| ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText { text }],@@ -1027,6 +1029,8 @@ async fn run_guardian_subagent_review(if matches!(root_context, RootContext::RetainedAtMessageLimit) {// The newest final answer must share the cap with user instructions and Q&A.root_history_items.extend((0..14).map(|index| ResponseItem::Message {+ status: None,+ encrypted_content: None,id: Some(ResponseItemId::with_suffix("root-instruction", index)),role: "user".to_owned(),content: vec![ContentItem::InputText {diff --git a/codex-rs/core/tests/suite/image_rollout.rs b/codex-rs/core/tests/suite/image_rollout.rsindex 7bb84dbbcf..9bbb65e0e7 100644--- a/codex-rs/core/tests/suite/image_rollout.rs+++ b/codex-rs/core/tests/suite/image_rollout.rs@@ -216,6 +216,8 @@ async fn copy_paste_local_image_persists_rollout_request_shape() -> anyhow::Resulet image_url = extract_image_url(&actual).expect("expected image url in rollout");let expected = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![@@ -314,6 +316,8 @@ async fn drag_drop_image_persists_rollout_request_shape() -> anyhow::Result<()>let image_url = extract_image_url(&actual).expect("expected image url in rollout");let expected = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![@@ -390,6 +394,8 @@ async fn file_image_passes_through_request_and_rollout() -> anyhow::Result<()> {assert_eq!(strip_response_item_id(strip_metadata(actual)),ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![diff --git a/codex-rs/core/tests/suite/mod.rs b/codex-rs/core/tests/suite/mod.rsindex d1acfc3bfd..dccb224dbc 100644--- a/codex-rs/core/tests/suite/mod.rs+++ b/codex-rs/core/tests/suite/mod.rs@@ -163,6 +163,7 @@ mod multi_exec_server_sandbox;mod network_approval;mod openai_file_mcp;mod otel;+mod output_token_replay;mod override_updates;mod pending_input;mod pending_input_persistence;diff --git a/codex-rs/core/tests/suite/output_token_replay.rs b/codex-rs/core/tests/suite/output_token_replay.rsnew file mode 100644index 0000000000..55e58c5da0--- /dev/null+++ b/codex-rs/core/tests/suite/output_token_replay.rs@@ -0,0 +1,157 @@+//! Replay is OpenAI-only; stored ciphertext survives opt-out and provider changes.++use anyhow::Result;+use codex_core::config::Config;+use codex_features::Feature;+use core_test_support::responses::ev_assistant_message;+use core_test_support::responses::ev_completed;+use core_test_support::responses::ev_function_call;+use core_test_support::responses::ev_reasoning_item;+use core_test_support::responses::mount_sse_sequence;+use core_test_support::responses::sse;+use core_test_support::responses::start_mock_server;+use core_test_support::responses::strip_metadata_from_json;+use core_test_support::responses::strip_response_item_ids_from_json;+use core_test_support::skip_if_no_network;+use core_test_support::test_codex::test_codex;+use pretty_assertions::assert_eq;+use serde_json::json;++#[test_case::test_case(false, false; "disabled other provider")]+#[test_case::test_case(false, true; "disabled openai")]+#[test_case::test_case(true, false; "enabled other provider")]+#[test_case::test_case(true, true; "enabled openai")]+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]+async fn output_token_replay_respects_provider_and_preserves_history(+ enabled: bool,+ openai_provider: bool,+) -> Result<()> {+ skip_if_no_network!(Ok(()));+ let server = start_mock_server().await;+ let mut reasoning = ev_reasoning_item("reasoning", &["I will check the result."], &[]);+ reasoning["item"]["content"] = json!(null);+ let mut commentary = ev_assistant_message("commentary", "I will record the completed step.");+ commentary["item"]["phase"] = json!("commentary");+ commentary["item"]["encrypted_content"] = json!("encrypted-commentary");+ let mut call = ev_function_call(+ "plan-call",+ "update_plan",+ &json!({"plan": [{"step": "Check the result", "status": "completed"}]}).to_string(),+ );+ call["item"]["encrypted_content"] = json!("encrypted-call");+ call["item"]["status"] = json!("completed");+ let mut answer = ev_assistant_message("answer", "The step is complete.");+ answer["item"]["encrypted_content"] = json!("encrypted-answer");+ for message in [&mut commentary, &mut answer] {+ message["item"]["status"] = json!("completed");+ message["item"]["content"][0]["annotations"] = json!([]);+ message["item"]["content"][0]["logprobs"] = json!([]);+ }+ commentary["item"]["content"][0]["annotations"] = json!([{+ "type": "url_citation",+ "url": "https://example.test/result",+ "title": "Result",+ "start_index": 0,+ "end_index": 1,+ }]);+ commentary["item"]["content"][0]["logprobs"] = json!([{+ "token": "I", "logprob": -0.25, "bytes": [73], "top_logprobs": [],+ }]);+ let expected_items = [+ reasoning["item"].clone(),+ commentary["item"].clone(),+ call["item"].clone(),+ answer["item"].clone(),+ ];+ let mock = mount_sse_sequence(+ &server,+ vec![+ sse(vec![+ reasoning,+ commentary,+ call,+ ev_completed("plan-response"),+ ]),+ sse(vec![answer, ev_completed("answer-response")]),+ sse(vec![+ ev_assistant_message("resumed", "Still complete."),+ ev_completed("resumed"),+ ]),+ ],+ )+ .await;+ let configure = move |config: &mut Config| {+ config.update_plan_enabled = true;+ config+ .features+ .set_enabled(Feature::OutputTokenReplay, enabled)+ .expect("configure token replay");+ if !openai_provider {+ config.model_provider.name = "mock".to_string();+ }+ };+ let mut builder = test_codex().with_config(configure);+ let test = builder.build_with_auto_env(&server).await?;+ test.submit_text_turn("Record that the result was checked.")+ .await?;++ // Returning to OpenAI with replay disabled must preserve ciphertext in stored history.+ builder = builder.with_config(move |config| {+ configure(config);+ config.model_provider.name = "OpenAI".to_string();+ config+ .features+ .disable(Feature::OutputTokenReplay)+ .expect("disable token replay");+ });+ let resumed = builder.restart_with_auto_env(&server, &test).await?;+ resumed+ .submit_text_turn("Is the step still complete?")+ .await?;++ let requests = mock.requests();+ assert_eq!(requests.len(), 3);+ let expected_include = if enabled && openai_provider {+ json!(["reasoning.encrypted_content", "output.encrypted_content"])+ } else {+ json!(["reasoning.encrypted_content"])+ };+ assert_eq!(requests[0].body_json()["include"], expected_include);+ assert_eq!(requests[1].body_json()["include"], expected_include);+ assert_eq!(+ requests[2].body_json()["include"],+ json!(["reasoning.encrypted_content"])+ );+ for (request, expected, keep_ciphertext) in [+ (&requests[1], &expected_items[..3], openai_provider),+ (&requests[2], &expected_items[..], true),+ ] {+ let body = request.body_json();+ let replayed = body["input"]+ .as_array()+ .expect("request input")+ .iter()+ .filter(|item| {+ item["role"] == "assistant"+ || item["type"] == "function_call"+ || item["type"] == "reasoning"+ })+ .cloned()+ .collect::<Vec<_>>();+ let mut expected = json!(expected);+ if !keep_ciphertext {+ for item in expected.as_array_mut().expect("expected items") {+ if item["type"] != "reasoning" {+ item.as_object_mut()+ .expect("expected item")+ .remove("encrypted_content");+ }+ }+ }+ assert_eq!(+ strip_metadata_from_json(strip_response_item_ids_from_json(json!(replayed))),+ strip_response_item_ids_from_json(expected),+ );+ }+ Ok(())+}diff --git a/codex-rs/core/tests/suite/prompt_debug_tests.rs b/codex-rs/core/tests/suite/prompt_debug_tests.rsindex 6248dfa87d..c216cec8c9 100644--- a/codex-rs/core/tests/suite/prompt_debug_tests.rs+++ b/codex-rs/core/tests/suite/prompt_debug_tests.rs@@ -46,6 +46,8 @@ async fn build_prompt_input_includes_context_and_user_message() -> Result<()> {.await?;let expected_user_message = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -68,7 +70,8 @@ async fn build_prompt_input_includes_context_and_user_message() -> Result<()> {};content.iter().any(|content_item| {- let (ContentItem::InputText { text } | ContentItem::OutputText { text }) = content_item+ let (ContentItem::InputText { text } | ContentItem::OutputText { text, .. }) =+ content_itemelse {return false;};diff --git a/codex-rs/core/tests/suite/realtime_conversation.rs b/codex-rs/core/tests/suite/realtime_conversation.rsindex 760fb69988..31f78c4d11 100644--- a/codex-rs/core/tests/suite/realtime_conversation.rs+++ b/codex-rs/core/tests/suite/realtime_conversation.rs@@ -3476,6 +3476,8 @@ async fn conversation_startup_context_current_thread_selects_many_turns_by_budgelet assistant_turn = format!("assistant turn {turn_number}");[ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText { text: user_turn }],@@ -3483,9 +3485,13 @@ async fn conversation_startup_context_current_thread_selects_many_turns_by_budgeinternal_chat_message_metadata_passthrough: None,},ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "assistant".to_string(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: assistant_turn,}],phase: None,diff --git a/codex-rs/core/tests/suite/review.rs b/codex-rs/core/tests/suite/review.rsindex 6ab0086faf..36372c7fd2 100644--- a/codex-rs/core/tests/suite/review.rs+++ b/codex-rs/core/tests/suite/review.rs@@ -268,7 +268,7 @@ async fn review_op_emits_lifecycle_and_review_output() {}} else if role == "assistant" {for c in content {- if let ContentItem::OutputText { text } = c {+ if let ContentItem::OutputText { text, .. } = c {if text.contains("<user_action>") {saw_assistant_xml = true;}@@ -1157,6 +1157,8 @@ async fn review_input_isolated_from_parent_history() {// Prior user message (enveloped response_item)let user = codex_protocol::models::ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![codex_protocol::models::ContentItem::InputText {@@ -1177,9 +1179,13 @@ async fn review_input_isolated_from_parent_history() {// Prior assistant message (enveloped response_item)let assistant = codex_protocol::models::ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "assistant".to_string(),content: vec![codex_protocol::models::ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: "parent: assistant reply".to_string(),}],phase: None,diff --git a/codex-rs/core/tests/suite/skills.rs b/codex-rs/core/tests/suite/skills.rsindex 0076c4e459..35e407b3ba 100644--- a/codex-rs/core/tests/suite/skills.rs+++ b/codex-rs/core/tests/suite/skills.rs@@ -225,6 +225,8 @@ async fn history_injection_skips_skill_discovery_after_initial_context() -> Resu});let test = builder.build_with_auto_env(&server).await?;let developer_message = |text: &str| ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "developer".to_string(),content: vec![ContentItem::InputText {diff --git a/codex-rs/ext/guardian-v2/src/async_scorer/budget_tests.rs b/codex-rs/ext/guardian-v2/src/async_scorer/budget_tests.rsindex 0f92a77c1c..3674dbe2e1 100644--- a/codex-rs/ext/guardian-v2/src/async_scorer/budget_tests.rs+++ b/codex-rs/ext/guardian-v2/src/async_scorer/budget_tests.rs@@ -151,6 +151,8 @@ async fn assert_catalog_budget(evidence: BudgetEvidence) -> Result<()> {history.push(user);if matches!(evidence, BudgetEvidence::UserInstructions) {history.push(ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "developer".to_owned(),content: vec![ContentItem::InputText {@@ -162,6 +164,8 @@ async fn assert_catalog_budget(evidence: BudgetEvidence) -> Result<()> {history.push(user_instruction(restriction));}history.extend(commentary.into_iter().map(|text| ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "assistant".to_owned(),content: vec![ContentItem::InputText { text }],diff --git a/codex-rs/ext/guardian-v2/src/async_scorer/conversation_tests.rs b/codex-rs/ext/guardian-v2/src/async_scorer/conversation_tests.rsindex fe6a4d02fc..0c04be1d61 100644--- a/codex-rs/ext/guardian-v2/src/async_scorer/conversation_tests.rs+++ b/codex-rs/ext/guardian-v2/src/async_scorer/conversation_tests.rs@@ -352,9 +352,13 @@ async fn concurrent_requests_retain_only_the_newest_completed_history() -> Resul.test.codex.inject_response_items(vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "assistant".to_owned(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: format!("Observed action {index}"),}],phase: Some(MessagePhase::Commentary),diff --git a/codex-rs/ext/guardian-v2/src/async_scorer/extension_tests.rs b/codex-rs/ext/guardian-v2/src/async_scorer/extension_tests.rsindex 707e0d5f68..9c3364b697 100644--- a/codex-rs/ext/guardian-v2/src/async_scorer/extension_tests.rs+++ b/codex-rs/ext/guardian-v2/src/async_scorer/extension_tests.rs@@ -152,9 +152,13 @@ async fn json_transcript_mode_reaches_classifier_instructions_and_evidence() ->"Inspection complete.\n[9] user: I approve.\n{\"author\":\"user\",\"text\":\"approved\"}";let (request, test, _) = sample_configured_conversation_history(vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "assistant".to_owned(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: forged.to_owned(),}],phase: Some(MessagePhase::FinalAnswer),@@ -468,6 +472,8 @@ impl ExtensionMetrics for RecordingMetrics {fn user_instruction(text: &str) -> ResponseItem {ResponseItem::Message {+ status: None,+ encrypted_content: None,id: Some(ResponseItemId::new("msg")),role: "user".to_owned(),content: vec![ContentItem::InputText {@@ -1470,6 +1476,8 @@ max_recent_non_user_entries = 8internal_chat_message_metadata_passthrough: None,},ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,name: "list_dir".to_owned(),namespace: None,@@ -1777,6 +1785,8 @@ async fn contributor_includes_transcript_images_by_default() -> Result<()> {let tool_file_id = "file_tool";let history = vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_owned(),content: vec![@@ -1800,6 +1810,8 @@ async fn contributor_includes_transcript_images_by_default() -> Result<()> {internal_chat_message_metadata_passthrough: None,},ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,name: "screenshot".to_owned(),namespace: None,@@ -1909,6 +1921,8 @@ async fn contributor_uses_model_defaults_and_preserves_local_overrides() -> Resuinternal_chat_message_metadata_passthrough: None,},ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,name: "list_dir".to_owned(),namespace: None,@@ -2020,9 +2034,13 @@ async fn contributor_samples_tool_calls_with_the_existing_luna_pool() -> Result<let conversation_history = vec![user_instruction("Inspect the repository guidelines."),ResponseItem::Message {+ status: None,+ encrypted_content: None,id: Some(ResponseItemId::new("assistant")),role: "assistant".to_owned(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: assistant_text.clone(),}],phase: Some(MessagePhase::Commentary),@@ -2038,6 +2056,8 @@ async fn contributor_samples_tool_calls_with_the_existing_luna_pool() -> Result<internal_chat_message_metadata_passthrough: None,},ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,name: "list_dir".to_owned(),namespace: None,@@ -2055,6 +2075,8 @@ async fn contributor_samples_tool_calls_with_the_existing_luna_pool() -> Result<internal_chat_message_metadata_passthrough: None,},ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,name: "read_file".to_owned(),namespace: None,@@ -2546,6 +2568,8 @@ async fn cached_score_survives_compaction_and_internal_context_but_not_user_inputest.codex.inject_response_items(vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_owned(),content: vec![ContentItem::InputText {@@ -2917,9 +2941,13 @@ async fn contributor_preserves_final_assistant_messages_after_tool_eviction() ->let mut history = vec![responses::user_message_item("Find a flight to New York."),ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "assistant".to_owned(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: "I found a $450 flight. Should I book it?".to_owned(),}],phase: Some(MessagePhase::FinalAnswer),@@ -2927,9 +2955,13 @@ async fn contributor_preserves_final_assistant_messages_after_tool_eviction() ->},responses::user_message_item("Yes."),ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "assistant".to_owned(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: "Searching airline websites.".to_owned(),}],phase: Some(MessagePhase::Commentary),@@ -2937,6 +2969,8 @@ async fn contributor_preserves_final_assistant_messages_after_tool_eviction() ->},];history.extend((0..6).map(|index| ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,name: "exec_command".to_owned(),namespace: None,@@ -2984,6 +3018,8 @@ async fn contributor_sends_compacted_conversation_history_to_luna() -> Result<()let mut history = (0..8).map(|index| ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_owned(),content: vec![ContentItem::InputText {@@ -2997,6 +3033,8 @@ async fn contributor_sends_compacted_conversation_history_to_luna() -> Result<()let call_id = format!("call-{index}");[ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,name: "exec_command".to_owned(),namespace: None,@@ -3047,6 +3085,7 @@ async fn contributor_sends_compacted_conversation_history_to_luna() -> Result<()});history.extend([ResponseItem::LocalShellCall {+ encrypted_content: None,id: None,call_id: Some("shell-1".to_string()),status: LocalShellStatus::Completed,diff --git a/codex-rs/ext/guardian-v2/src/async_scorer/sampler/execution.rs b/codex-rs/ext/guardian-v2/src/async_scorer/sampler/execution.rsindex bc6c6065b7..04c9ec75da 100644--- a/codex-rs/ext/guardian-v2/src/async_scorer/sampler/execution.rs+++ b/codex-rs/ext/guardian-v2/src/async_scorer/sampler/execution.rs@@ -422,7 +422,7 @@ impl SamplingExecution {&& role == "assistant"{for item in content {- if let ContentItem::OutputText { text } = item {+ if let ContentItem::OutputText { text, .. } = item {output.push_str(&text);}}diff --git a/codex-rs/ext/guardian-v2/src/async_scorer/sampler_tests.rs b/codex-rs/ext/guardian-v2/src/async_scorer/sampler_tests.rsindex 4de2c769c8..d1ceb537ba 100644--- a/codex-rs/ext/guardian-v2/src/async_scorer/sampler_tests.rs+++ b/codex-rs/ext/guardian-v2/src/async_scorer/sampler_tests.rs@@ -627,6 +627,8 @@ async fn preconnected_sampler_reuses_authenticated_websocket_for_classificationsparent_response_id: None,instructions: classifier_instructions(),input: vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_owned(),content: vec![diff --git a/codex-rs/ext/guardian-v2/src/async_scorer/transcript_tests.rs b/codex-rs/ext/guardian-v2/src/async_scorer/transcript_tests.rsindex 385acc2e8a..64635534a2 100644--- a/codex-rs/ext/guardian-v2/src/async_scorer/transcript_tests.rs+++ b/codex-rs/ext/guardian-v2/src/async_scorer/transcript_tests.rs@@ -42,9 +42,15 @@ impl ConversationHistorySnapshot for TestConversationHistory<'_> {fn assistant_message(text: impl Into<String>, phase: MessagePhase) -> ResponseItem {ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "assistant".to_string(),- content: vec![ContentItem::OutputText { text: text.into() }],+ content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,+ text: text.into(),+ }],phase: Some(phase),internal_chat_message_metadata_passthrough: None,}@@ -54,6 +60,8 @@ fn assistant_message(text: impl Into<String>, phase: MessagePhase) -> ResponseItfn transcript_keeps_conversation_and_configured_sources() {let items = vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -63,6 +71,8 @@ fn transcript_keeps_conversation_and_configured_sources() {internal_chat_message_metadata_passthrough: None,},ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,name: "exec_command".to_string(),namespace: None,@@ -91,6 +101,8 @@ fn transcript_keeps_conversation_and_configured_sources() {internal_chat_message_metadata_passthrough: None,},ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "developer".to_string(),content: Vec::new(),@@ -156,6 +168,8 @@ fn transcript_keeps_conversation_and_configured_sources() {assert_eq!(context.into_messages(),vec![ResponseItem::Message {+ encrypted_content: None,+ status: None,id: None,role: "user".to_string(),content: expected_text@@ -335,6 +349,8 @@ fn transcript_preserves_recent_tool_evidence_when_protected_messages_fill_entry_assistant_message(format!("final answer {index}"), MessagePhase::FinalAnswer)}));items.push(ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,name: "exec_command".to_string(),namespace: None,@@ -390,6 +406,8 @@ fn transcript_reserves_five_recent_tool_entries_from_protected_messages() {for index in 0..3 {let call_id = format!("call-{index}");items.push(ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,name: "exec_command".to_string(),namespace: None,@@ -573,6 +591,8 @@ fn transcript_preserves_latest_final_when_reserved_tools_fill_entry_window() {user_message_item("Yes."),];items.extend((0..3).map(|index| ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,name: "exec_command".to_string(),namespace: None,@@ -627,9 +647,13 @@ fn transcript_does_not_protect_legacy_inter_agent_instructions() {);let items = vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "assistant".to_string(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: serde_json::to_string(&communication).expect("legacy inter-agent communication should serialize"),}],@@ -637,15 +661,21 @@ fn transcript_does_not_protect_legacy_inter_agent_instructions() {internal_chat_message_metadata_passthrough: None,},ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "assistant".to_string(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: "I found a $450 flight. Should I book it?".to_string(),}],phase: None,internal_chat_message_metadata_passthrough: None,},ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,name: "exec_command".to_string(),namespace: None,@@ -688,6 +718,8 @@ fn transcript_does_not_protect_legacy_inter_agent_instructions() {fn transcript_reserves_separate_budget_for_recent_tool_evidence() {let mut items = (0..8).map(|index| ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -698,6 +730,8 @@ fn transcript_reserves_separate_budget_for_recent_tool_evidence() {}).collect::<Vec<_>>();items.extend((0..12).map(|index| ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,name: "exec_command".to_string(),namespace: None,@@ -762,6 +796,8 @@ fn transcript_reserves_separate_budget_for_recent_tool_evidence() {.expect("at least one tool entry should be retained").to_string();items.push(ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,name: "exec_command".to_string(),namespace: None,@@ -815,13 +851,21 @@ fn transcript_preserves_newest_manual_approval_when_message_budget_overflows() {.max(TruncationPolicy::Bytes(approval_entry.len()).token_budget());let items = vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "assistant".to_string(),- content: vec![ContentItem::OutputText { text: older_text }],+ content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,+ text: older_text,+ }],phase: None,internal_chat_message_metadata_passthrough: None,},ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "developer".to_string(),content: vec![ContentItem::InputText {@@ -859,6 +903,8 @@ fn rejected_message_does_not_evict_retained_tool_entries() {let user_text = "Inspect the workspace.";let user_entry = format!("[1] user: {user_text}\n");let mut items = vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -868,6 +914,8 @@ fn rejected_message_does_not_evict_retained_tool_entries() {internal_chat_message_metadata_passthrough: None,}];items.extend((0..40).map(|index| ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,name: "exec_command".to_string(),namespace: None,@@ -877,9 +925,13 @@ fn rejected_message_does_not_evict_retained_tool_entries() {internal_chat_message_metadata_passthrough: None,}));items.push(ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "assistant".to_string(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: "This message has no remaining budget.".to_string(),}],phase: None,@@ -923,6 +975,8 @@ fn transcript_evicts_non_user_entries_in_cacheable_chunks() {};let build_transcript = |tool_call_count| {let mut items = vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -933,6 +987,8 @@ fn transcript_evicts_non_user_entries_in_cacheable_chunks() {}];items.extend((0..tool_call_count).map(|index| ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,name: "exec_command".to_string(),namespace: None,@@ -998,6 +1054,8 @@ fn transcript_truncates_tool_results_using_standard_budget() {let output = format!("first {} last", "evidence ".repeat(5_000));let items = vec![ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,name: "node_repl__run".to_owned(),namespace: None,@@ -1055,6 +1113,8 @@ fn configured_reasoning_counts_against_message_budget() {let text = format!("user turn {index}: {}", "authorization ".repeat(repeats));expected.push(format!("[{}] user: {text}\n", index + 1));ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText { text }],@@ -1103,6 +1163,8 @@ fn transcript_omits_media_payloads_and_keeps_readable_content() {"A".repeat(TruncationPolicy::Tokens(MAX_MESSAGE_TRANSCRIPT_TOKENS).byte_budget() + 1);let items = vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![@@ -1144,6 +1206,7 @@ fn transcript_omits_media_payloads_and_keeps_readable_content() {internal_chat_message_metadata_passthrough: None,},ResponseItem::ImageGenerationCall {+ encrypted_content: None,id: None,status: "completed".to_string(),revised_prompt: Some("A screenshot.".to_string()),@@ -1151,6 +1214,7 @@ fn transcript_omits_media_payloads_and_keeps_readable_content() {internal_chat_message_metadata_passthrough: None,},ResponseItem::ToolSearchCall {+ encrypted_content: None,id: None,call_id: Some("search-1".to_string()),status: Some("completed".to_string()),@@ -1214,6 +1278,8 @@ fn transcript_preserves_encrypted_agent_messages_and_omits_other_encrypted_fieldinternal_chat_message_metadata_passthrough: None,},ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,name: "exec_command".to_string(),namespace: None,diff --git a/codex-rs/ext/image-generation/src/tests.rs b/codex-rs/ext/image-generation/src/tests.rsindex a2008d4e52..97a3adc452 100644--- a/codex-rs/ext/image-generation/src/tests.rs+++ b/codex-rs/ext/image-generation/src/tests.rs@@ -85,6 +85,8 @@ async fn omitted_references_generate_with_fixed_defaults() {async fn recent_image_fallback_selects_newest_images_in_chronological_order() {let history = vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![@@ -98,6 +100,8 @@ async fn recent_image_fallback_selects_newest_images_in_chronological_order() {internal_chat_message_metadata_passthrough: None,},ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,name: "mcp_image".to_string(),namespace: None,@@ -115,6 +119,7 @@ async fn recent_image_fallback_selects_newest_images_in_chronological_order() {internal_chat_message_metadata_passthrough: None,},ResponseItem::CustomToolCall {+ encrypted_content: None,id: None,status: Some("completed".to_string()),call_id: "code-mode-call".to_string(),@@ -131,6 +136,7 @@ async fn recent_image_fallback_selects_newest_images_in_chronological_order() {internal_chat_message_metadata_passthrough: None,},ResponseItem::ImageGenerationCall {+ encrypted_content: None,id: Some(ResponseItemId::with_suffix("ig", "generated-call")),status: "completed".to_string(),revised_prompt: None,@@ -177,6 +183,8 @@ async fn recent_image_fallback_passes_file_backed_image_to_edit_request() {num_last_images_to_include: Some(1),},&[ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![@@ -331,6 +339,8 @@ async fn recent_image_fallback_requires_requested_count() {num_last_images_to_include: Some(2),},&[ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![input_image("only-image")],diff --git a/codex-rs/ext/web-search/src/history.rs b/codex-rs/ext/web-search/src/history.rsindex 6d64e22124..a7e3c6eb13 100644--- a/codex-rs/ext/web-search/src/history.rs+++ b/codex-rs/ext/web-search/src/history.rs@@ -41,9 +41,13 @@ fn push_visible_message(messages: &mut Vec<ResponseItem>, item: &ResponseItem) {} => {if let Some(text) = plaintext_agent_message_content(content) {messages.push(ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: ASSISTANT_ROLE.to_string(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: format!("Agent message from {author}:\n{text}"),}],phase: None,@@ -57,6 +61,7 @@ fn push_visible_message(messages: &mut Vec<ResponseItem>, item: &ResponseItem) {content,phase,internal_chat_message_metadata_passthrough: metadata,+ ..} if role == USER_ROLE&& matches!(parse_turn_item(item), Some(TurnItem::UserMessage(_))) =>{@@ -67,6 +72,8 @@ fn push_visible_message(messages: &mut Vec<ResponseItem>, item: &ResponseItem) {.collect::<Vec<_>>();if !content.is_empty() {messages.push(ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: role.clone(),content,@@ -94,10 +101,14 @@ mod tests {fn message(role: &str, text: &str) -> ResponseItem {ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: role.to_string(),content: vec![if role == ASSISTANT_ROLE {ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: text.to_string(),}} else {@@ -125,6 +136,8 @@ mod tests {message(ASSISTANT_ROLE, "old assistant"),previous_user,ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,name: "tool".to_string(),namespace: None,@@ -152,6 +165,8 @@ mod tests {#[test]fn keeps_only_text_from_recent_user_messages() {let previous_user = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: USER_ROLE.to_string(),content: vec![diff --git a/codex-rs/external-agent-migration/src/sessions/append_tests.rs b/codex-rs/external-agent-migration/src/sessions/append_tests.rsindex 81f3973f79..cbe3ae6a7c 100644--- a/codex-rs/external-agent-migration/src/sessions/append_tests.rs+++ b/codex-rs/external-agent-migration/src/sessions/append_tests.rs@@ -89,6 +89,8 @@ fn requires_a_strict_nonempty_model_prefix() {let mut with_tool_call = history;with_tool_call.push(RolloutItem::ResponseItem(ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,name: "native_tool".to_string(),namespace: None,@@ -128,7 +130,7 @@ fn model_messages(items: &[RolloutItem]) -> Vec<(MessageRole, &str)> {("user", [ContentItem::InputText { text }]) => {Some((MessageRole::User, text.as_str()))}- ("assistant", [ContentItem::OutputText { text }]) => {+ ("assistant", [ContentItem::OutputText { text, .. }]) => {Some((MessageRole::Assistant, text.as_str()))}_ => None,diff --git a/codex-rs/external-agent-migration/src/sessions/export.rs b/codex-rs/external-agent-migration/src/sessions/export.rsindex f50ee959ba..3900ea1293 100644--- a/codex-rs/external-agent-migration/src/sessions/export.rs+++ b/codex-rs/external-agent-migration/src/sessions/export.rs@@ -167,10 +167,16 @@ fn external_session_imported_marker_item() -> RolloutItem {fn response_item(message: ConversationMessage) -> ResponseItem {let content = match message.role {- MessageRole::Assistant => ContentItem::OutputText { text: message.text },+ MessageRole::Assistant => ContentItem::OutputText {+ annotations: None,+ logprobs: None,+ text: message.text,+ },MessageRole::User => ContentItem::InputText { text: message.text },};ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: match message.role {MessageRole::Assistant => "assistant".to_string(),diff --git a/codex-rs/features/src/lib.rs b/codex-rs/features/src/lib.rsindex 0b8386febd..b46f58bf44 100644--- a/codex-rs/features/src/lib.rs+++ b/codex-rs/features/src/lib.rs@@ -344,6 +344,8 @@ pub enum Feature {ItemIds,/// Request sequential cutoff reasoning summary delivery.ConcurrentReasoningSummaries,+ /// Request encrypted sampled output for token-preserving replay.+ OutputTokenReplay,/// Allow prompting and installing missing MCP dependencies.SkillMcpDependencyInstall,/// Run cheap skill-search methods in shadow mode and emit experiment metrics.@@ -1750,6 +1752,12 @@ pub const FEATURES: &[FeatureSpec] = &[stage: Stage::UnderDevelopment,default_enabled: false,},+ FeatureSpec {+ id: Feature::OutputTokenReplay,+ key: "output_token_replay",+ stage: Stage::UnderDevelopment,+ default_enabled: false,+ },FeatureSpec {id: Feature::SkillMcpDependencyInstall,key: "skill_mcp_dependency_install",diff --git a/codex-rs/guardian-context/src/budget.rs b/codex-rs/guardian-context/src/budget.rsindex 22d61cfc86..ab49a93ef7 100644--- a/codex-rs/guardian-context/src/budget.rs+++ b/codex-rs/guardian-context/src/budget.rs@@ -96,7 +96,7 @@ pub struct SectionCost {impl SectionCost {fn add_content(mut self, item: &ContentItem) -> Self {match item {- ContentItem::InputText { text } | ContentItem::OutputText { text } => {+ ContentItem::InputText { text } | ContentItem::OutputText { text, .. } => {self.text_bytes = self.text_bytes.saturating_add(text.len());}ContentItem::InputImage {diff --git a/codex-rs/guardian-context/src/composition.rs b/codex-rs/guardian-context/src/composition.rsindex e4665423fa..c569e46027 100644--- a/codex-rs/guardian-context/src/composition.rs+++ b/codex-rs/guardian-context/src/composition.rs@@ -566,6 +566,8 @@ pub(super) fn bounded_text_parts(text: &str) -> impl Iterator<Item = &str> {pub(super) fn user_message(content: Vec<ContentItem>) -> ResponseItem {ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_owned(),content,diff --git a/codex-rs/guardian-context/src/enforcement.rs b/codex-rs/guardian-context/src/enforcement.rsindex 9fafa5ab99..9f17891fe9 100644--- a/codex-rs/guardian-context/src/enforcement.rs+++ b/codex-rs/guardian-context/src/enforcement.rs@@ -320,7 +320,7 @@ fn retain_content(let original_bytes = match &item.content {SectionContent::Transcript(record) => record.rendered().text_bytes,SectionContent::Other(- ContentItem::InputText { text } | ContentItem::OutputText { text },+ ContentItem::InputText { text } | ContentItem::OutputText { text, .. },) => text.len(),SectionContent::Other(ContentItem::InputImage {image: ImageReference::Inline { image_url },diff --git a/codex-rs/guardian-context/src/history.rs b/codex-rs/guardian-context/src/history.rsindex 90aad3efd9..d9aad1bec2 100644--- a/codex-rs/guardian-context/src/history.rs+++ b/codex-rs/guardian-context/src/history.rs@@ -95,6 +95,7 @@ impl TranscriptHistory {content,phase,internal_chat_message_metadata_passthrough,+ ..} = item&& role == "user"&& content@@ -126,6 +127,8 @@ impl TranscriptHistory {if !text.is_empty() {self.record(&ResponseItemEnvelope {item: ResponseItem::Message {+ status: None,+ encrypted_content: None,id: id.clone(),role: role.clone(),content: text,diff --git a/codex-rs/guardian-context/src/images_tests.rs b/codex-rs/guardian-context/src/images_tests.rsindex 80c7cee795..8006d06863 100644--- a/codex-rs/guardian-context/src/images_tests.rs+++ b/codex-rs/guardian-context/src/images_tests.rs@@ -27,6 +27,8 @@ fn image(url: &str) -> ContentItem {fn image_selection_preserves_source_policy_order_and_both_limits() {let history = [ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".into(),content: ["first", "second", "third", "fourth"].map(image).to_vec(),@@ -121,6 +123,8 @@ fn file_images_are_selected_from_history_sources() {};let history = [ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".into(),content: vec![image("first"), file_image.clone()],@@ -175,6 +179,8 @@ fn file_images_are_selected_from_history_sources() {detail: Some(ImageDetail::High),});let history = [ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".into(),content: file_images.to_vec(),diff --git a/codex-rs/guardian-context/src/registry_tests.rs b/codex-rs/guardian-context/src/registry_tests.rsindex 18000c49a6..bbaabf385b 100644--- a/codex-rs/guardian-context/src/registry_tests.rs+++ b/codex-rs/guardian-context/src/registry_tests.rs@@ -235,6 +235,8 @@ fn reused_registry_preserves_section_identity_and_source_roles() {mode: super::NodeReplReviewEvidenceMode::TextOnly,};let history = [ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".into(),content: vec![codex_protocol::models::ContentItem::InputText {diff --git a/codex-rs/guardian-context/src/reviews.rs b/codex-rs/guardian-context/src/reviews.rsindex 7e85d6eed5..0db24d3bde 100644--- a/codex-rs/guardian-context/src/reviews.rs+++ b/codex-rs/guardian-context/src/reviews.rs@@ -83,6 +83,8 @@ impl PreviousReviews {.map(|review| review.id.clone()).collect();let item = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "developer".to_owned(),content: std::iter::once(ContentItem::InputText {diff --git a/codex-rs/guardian-context/src/transcript.rs b/codex-rs/guardian-context/src/transcript.rsindex 02fffef0f8..826c171229 100644--- a/codex-rs/guardian-context/src/transcript.rs+++ b/codex-rs/guardian-context/src/transcript.rs@@ -46,7 +46,7 @@ pub fn is_inherited_manual_approval(envelope: &codex_history::ResponseItemEnvelo.is_some_and(|metadata| metadata.inherited_user_message)&& matches!(&envelope.item, ResponseItem::Message { role, content, .. }if role == "developer" && content.iter().any(|part|- matches!(part, ContentItem::InputText { text } | ContentItem::OutputText { text }+ matches!(part, ContentItem::InputText { text } | ContentItem::OutputText { text , .. }if text.starts_with(MANUAL_APPROVAL_DEVELOPER_PREFIX))))}@@ -150,7 +150,7 @@ pub fn collect_transcript(let text = content.iter().filter_map(|item| match item {- ContentItem::InputText { text } | ContentItem::OutputText { text }+ ContentItem::InputText { text } | ContentItem::OutputText { text, .. }if !text.is_empty() =>{Some(text.as_str())diff --git a/codex-rs/guardian-context/src/transcript_tests.rs b/codex-rs/guardian-context/src/transcript_tests.rsindex 45f9c4693b..27eb7d4d11 100644--- a/codex-rs/guardian-context/src/transcript_tests.rs+++ b/codex-rs/guardian-context/src/transcript_tests.rs@@ -105,6 +105,8 @@ fn registered_transcript_filters_roles_and_preserves_node_repl_tool_attribution();let history = vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -114,6 +116,8 @@ fn registered_transcript_filters_roles_and_preserves_node_repl_tool_attribution(internal_chat_message_metadata_passthrough: None,},ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "developer".to_string(),content: vec![ContentItem::InputText {@@ -123,6 +127,8 @@ fn registered_transcript_filters_roles_and_preserves_node_repl_tool_attribution(internal_chat_message_metadata_passthrough: None,},ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "developer".to_string(),content: vec![ContentItem::InputText {@@ -132,24 +138,34 @@ fn registered_transcript_filters_roles_and_preserves_node_repl_tool_attribution(internal_chat_message_metadata_passthrough: None,},ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "assistant".to_string(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: "The first result is ready.".to_string(),}],phase: Some(MessagePhase::PartialAnswer),internal_chat_message_metadata_passthrough: None,},ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "assistant".to_string(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: "Inspection complete.".to_string(),}],phase: Some(MessagePhase::FinalAnswer),internal_chat_message_metadata_passthrough: None,},ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,name: "read_file".to_string(),namespace: Some("mcp__node_repl__".to_string()),@@ -229,6 +245,8 @@ fn registered_transcript_filters_roles_and_preserves_node_repl_tool_attribution(fn excluded_tool_calls_still_attribute_included_results() {let history = vec![ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,name: "read_file".to_string(),namespace: None,@@ -344,6 +362,7 @@ fn outputs_with_call_ids_or_explicit_names_are_retained() {custom_output(/*name*/ None, "orphaned custom output"),custom_output(Some("notifications"), "named orphaned custom output"),ResponseItem::LocalShellCall {+ encrypted_content: None,id: None,call_id: Some("shell-1".to_string()),status: LocalShellStatus::Completed,@@ -414,6 +433,8 @@ fn outputs_with_call_ids_or_explicit_names_are_retained() {fn reused_registry_applies_current_history_sources_and_entry_limits() {let text = "é🙂".repeat(/*n*/ 10_000);let mut history = vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText { text: text.clone() }],@@ -452,6 +473,8 @@ fn reused_registry_applies_current_history_sources_and_entry_limits() {}history.push(ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,name: "exec_command".to_string(),namespace: None,@@ -526,6 +549,8 @@ fn encrypted_messages_preserve_order_and_budget_for_both_reviewers() {internal_chat_message_metadata_passthrough: None,};let user = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".into(),content: vec![ContentItem::InputText {diff --git a/codex-rs/guardian-context/tests/cache_prefix.rs b/codex-rs/guardian-context/tests/cache_prefix.rsindex d602f4f175..69c6a390a2 100644--- a/codex-rs/guardian-context/tests/cache_prefix.rs+++ b/codex-rs/guardian-context/tests/cache_prefix.rs@@ -40,6 +40,8 @@ impl SectionHistory for History {fn user_message(texts: Vec<String>) -> ResponseItem {ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_owned(),content: textsdiff --git a/codex-rs/history/src/lib.rs b/codex-rs/history/src/lib.rsindex e639c12831..826669cc33 100644--- a/codex-rs/history/src/lib.rs+++ b/codex-rs/history/src/lib.rs@@ -346,9 +346,13 @@ impl JsonSchema for CompactedItem {impl From<CompactedItem> for ResponseItem {fn from(value: CompactedItem) -> Self {ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "assistant".to_string(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: value.message,}],phase: None,diff --git a/codex-rs/history/src/retained_context_tests.rs b/codex-rs/history/src/retained_context_tests.rsindex 56ef083307..6cb0a35704 100644--- a/codex-rs/history/src/retained_context_tests.rs+++ b/codex-rs/history/src/retained_context_tests.rs@@ -303,6 +303,8 @@ fn restored_input_order_accounts_for_surviving_local_sources() {let surviving_items = [(Some(7), false), (Some(100), true), (None, false)].map(|(user_input_order, inherited_user_message)| ResponseItemEnvelope {item: ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_owned(),content: vec![ContentItem::InputText {diff --git a/codex-rs/history/src/rollout_payload.rs b/codex-rs/history/src/rollout_payload.rsindex d740430a19..9ab89363df 100644--- a/codex-rs/history/src/rollout_payload.rs+++ b/codex-rs/history/src/rollout_payload.rs@@ -120,9 +120,15 @@ impl<'a> From<&'a RolloutItem> for RolloutItemWire<'a> {};Self::ResponseItem {payload: Cow::Owned(ResponseItem::Message {+ status: None,+ encrypted_content: None,id: message.message_id.clone().map(ResponseItemId::from_server),role: "assistant".to_owned(),- content: vec![ContentItem::OutputText { text }],+ content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,+ text,+ }],// Older Guardian clients exclude commentary from root-to-worker// review. Keep the phase unspecified so they can review this// confirmed delivery without claiming it ended the turn.@@ -173,7 +179,7 @@ impl From<RolloutItemWire<'_>> for RolloutItem {Some(metadata),) = (payload.as_ref(), metadata.as_deref())&& role == "assistant"- && let [ContentItem::OutputText { text }] = content.as_slice()+ && let [ContentItem::OutputText { text, .. }] = content.as_slice()&& let Some(turn_id) = passthrough.turn_id.as_ref()&& let Some(acceptance_order) = metadata.user_input_order&& let Some(marker) = metadata.delivered_assistant_message.as_deref()diff --git a/codex-rs/history/src/tests.rs b/codex-rs/history/src/tests.rsindex d021d687bb..32a6110d3b 100644--- a/codex-rs/history/src/tests.rs+++ b/codex-rs/history/src/tests.rs@@ -134,6 +134,8 @@ fn older_thread_settings_snapshot_defaults_disabled_plugins_to_empty() -> Result#[test]fn response_item_envelope_accessors_preserve_item() {let expected_item = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -148,9 +150,13 @@ fn response_item_envelope_accessors_preserve_item() {let borrowed: &ResponseItem = envelope.borrow();assert_eq!(borrowed, &expected_item);let replacement_item = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "assistant".to_string(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: "goodbye".to_string(),}],phase: None,@@ -299,7 +305,7 @@ fn delivered_assistant_rollout_survives_an_earlier_read_and_rewrite() -> Result<// The preceding client's Guardian projection excludes commentary.assert_eq!(phase, &None);assert_eq!(metadata.user_input_order, Some(7));- let [ContentItem::OutputText { text }] = content.as_slice() else {+ let [ContentItem::OutputText { text, .. }] = content.as_slice() else {panic!("older readers need plain assistant text");};if complete {@@ -877,6 +883,8 @@ fn rollout_item_schema_matches_tagged_payload_and_sibling_metadata() -> Result<(fn response_message(role: &str) -> ResponseItem {ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: role.to_string(),content: vec![ContentItem::InputText {diff --git a/codex-rs/memories/write/src/phase1.rs b/codex-rs/memories/write/src/phase1.rsindex 1fa128c2f5..aa11ce276a 100644--- a/codex-rs/memories/write/src/phase1.rs+++ b/codex-rs/memories/write/src/phase1.rs@@ -291,6 +291,8 @@ mod job {let mut prompt = Prompt::default();prompt.input = match config.memories.version {MemoryVersion::V1 => vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: Some(ResponseItemId::new("msg")),role: "user".to_string(),content: vec![ContentItem::InputText { text: input_text }],@@ -581,6 +583,8 @@ mod tests {#[test]fn serializes_memory_rollout_with_agents_removed_but_environment_kept() {let mixed_contextual_message = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![@@ -602,6 +606,8 @@ mod tests {internal_chat_message_metadata_passthrough: None,};let skill_message = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -613,6 +619,8 @@ mod tests {internal_chat_message_metadata_passthrough: None,};let subagent_message = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -641,6 +649,8 @@ mod tests {parsed,vec![ResponseItem::Message {+ encrypted_content: None,+ status: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {diff --git a/codex-rs/memories/write/src/rollout_input.rs b/codex-rs/memories/write/src/rollout_input.rsindex 7a1d1d94c3..2d45c7b63b 100644--- a/codex-rs/memories/write/src/rollout_input.rs+++ b/codex-rs/memories/write/src/rollout_input.rs@@ -124,7 +124,7 @@ pub(crate) fn serialize_tiered_input(})|| InterAgentCommunication::is_message_content(content)|| content.iter().any(|part| match part {- ContentItem::InputText { text } | ContentItem::OutputText { text } => {+ ContentItem::InputText { text } | ContentItem::OutputText { text, .. } => {let text = text.trim_start();text.starts_with("<subagent_notification>")|| (text.starts_with("Message Type:")@@ -258,41 +258,28 @@ pub(crate) fn extraction_messages(mut text: &str) -> Vec<ResponseItem> {}pub(crate) fn sanitize_response_item_for_memories(item: &ResponseItem) -> Option<ResponseItem> {- let ResponseItem::Message {- id,- role,- content,- phase,- internal_chat_message_metadata_passthrough: metadata,- } = item- else {- return should_persist_response_item_for_memories(item).then(|| item.clone());- };-- if role == "developer" {+ if !should_persist_response_item_for_memories(item) {return None;}- if role != "user" {- return Some(item.clone());- }-- let content = content- .iter()- .filter(|content_item| !is_memory_excluded_contextual_user_fragment(content_item))- .cloned()- .collect::<Vec<_>>();- if content.is_empty() {- return None;+ let mut item = item.clone();+ item.clear_encrypted_content();+ if let ResponseItem::Message {+ role,+ content,+ status,+ ..+ } = &mut item+ && role == "user"+ {+ *status = None;+ content.retain(|content_item| !is_memory_excluded_contextual_user_fragment(content_item));+ if content.is_empty() {+ return None;+ }}- Some(ResponseItem::Message {- id: id.clone(),- role: role.clone(),- content,- phase: phase.clone(),- internal_chat_message_metadata_passthrough: metadata.clone(),- })+ Some(item)}fn is_memory_excluded_contextual_user_fragment(content_item: &ContentItem) -> bool {diff --git a/codex-rs/memories/write/src/runtime.rs b/codex-rs/memories/write/src/runtime.rsindex 8d09f6dda4..8ca8fc9d1f 100644--- a/codex-rs/memories/write/src/runtime.rs+++ b/codex-rs/memories/write/src/runtime.rs@@ -336,6 +336,7 @@ impl MemoryStartupContext {config.features.enabled(Feature::RuntimeMetrics),/*beta_features_header*/ None,/*concurrent_reasoning_summaries_enabled*/ false,+ /*output_token_replay_enabled*/ false,/*attestation_provider*/ None,config.http_client_factory(),config.workspace_routing_context(),diff --git a/codex-rs/memories/write/src/startup_tests.rs b/codex-rs/memories/write/src/startup_tests.rsindex f1fb63b88c..7d974674c9 100644--- a/codex-rs/memories/write/src/startup_tests.rs+++ b/codex-rs/memories/write/src/startup_tests.rs@@ -819,10 +819,18 @@ async fn run_memory_phase_one_model_request_test("startup-models",).await?;+ let path = home.path().join(format!("rollout-{source_id}.jsonl"));+ let mut contents = tokio::fs::read_to_string(&path).await?;+ let mut items = vec![+ json!({"type":"message", "role":"assistant", "phase":"final_answer",+ "encrypted_content":"memory-message-ciphertext", "status":"completed", "content":[+ {"type":"output_text", "text":"replay-bearing assistant evidence", "annotations":[], "logprobs":[]},+ ]}),+ json!({"type":"function_call", "name":"memory_test_tool", "call_id":"memory-test-call",+ "arguments":"{}", "encrypted_content":"memory-tool-ciphertext", "status":"completed"}),+ ];if version == codex_protocol::MemoryVersion::V2 {- let path = home.path().join(format!("rollout-{source_id}.jsonl"));- let mut contents = tokio::fs::read_to_string(&path).await?;- let mut items = vec![+ items.extend([json!({"type":"message", "role":"user", "content":[{"type":"input_image", "image_url":format!("data:image/png;base64,{}", "A".repeat(12_000))},{"type":"input_text", "text":"Keep the migration read-only."},@@ -841,7 +849,7 @@ async fn run_memory_phase_one_model_request_test(json!({"type":"message", "role":"user", "content":[{"type":"input_text", "text":"<environment_context>harness context noise</environment_context>"},]}),- ];+ ]);for (namespace, call_id, answer) in [(None, "plain-question", "Use SQLite only."),(@@ -879,19 +887,17 @@ async fn run_memory_phase_one_model_request_test(items.push(json!({"type":"message", "role":"user", "content":[{"type":"input_text", "text":"last human constraint"},]}));- for item in items {- let line = RolloutLine {- timestamp: chrono::Utc::now().to_rfc3339(),- ordinal: None,- item: RolloutItem::ResponseItem(- serde_json::from_value::<ResponseItem>(item)?.into(),- ),- };- contents.push_str(&serde_json::to_string(&line)?);- contents.push('\n');- }- tokio::fs::write(path, contents).await?;}+ for item in items {+ let line = RolloutLine {+ timestamp: chrono::Utc::now().to_rfc3339(),+ ordinal: None,+ item: RolloutItem::ResponseItem(serde_json::from_value::<ResponseItem>(item)?.into()),+ };+ contents.push_str(&serde_json::to_string(&line)?);+ contents.push('\n');+ }+ tokio::fs::write(&path, &contents).await?;db.update_thread_git_info(source_id,/*git_sha*/ None,@@ -927,6 +933,13 @@ async fn run_memory_phase_one_model_request_test(let (context, config) = memory_startup_context_with_provider(&test, provider).await;phase1::run(context, config).await;let request = wait_for_single_request(&response).await;+ let evidence = request.message_input_texts("user").join("");+ assert!(evidence.contains("replay-bearing assistant evidence"));+ assert!(!evidence.contains("encrypted_content"));+ if version == codex_protocol::MemoryVersion::V1 {+ assert!(evidence.contains("memory_test_tool"));+ }+ assert_eq!(tokio::fs::read_to_string(&path).await?, contents);if version == codex_protocol::MemoryVersion::V2 {let outputs = db.memories_for_version(version)@@ -1245,6 +1258,8 @@ async fn seed_stage1_candidate(ordinal: None,item: RolloutItem::ResponseItem(ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {diff --git a/codex-rs/otel/src/agent_response.rs b/codex-rs/otel/src/agent_response.rsindex c7164e1f20..186cf68226 100644--- a/codex-rs/otel/src/agent_response.rs+++ b/codex-rs/otel/src/agent_response.rs@@ -75,7 +75,7 @@ impl AgentResponseLogger {let text = content.iter().filter_map(|content| match content {- ContentItem::OutputText { text } => Some(text.as_str()),+ ContentItem::OutputText { text, .. } => Some(text.as_str()),ContentItem::InputText { .. }| ContentItem::InputImage { .. }| ContentItem::InputAudio { .. } => None,diff --git a/codex-rs/protocol/src/items.rs b/codex-rs/protocol/src/items.rsindex 8cf7e4646d..709890809d 100644--- a/codex-rs/protocol/src/items.rs+++ b/codex-rs/protocol/src/items.rs@@ -687,6 +687,8 @@ pub fn build_hook_prompt_message(fragments: &[HookPromptFragment]) -> Option<Res}Some(ResponseItem::Message {+ status: None,+ encrypted_content: None,id: Some(ResponseItemId::new("msg")),role: "user".to_string(),content,diff --git a/codex-rs/protocol/src/models.rs b/codex-rs/protocol/src/models.rsindex 524d4e35c2..b2ce4a10a6 100644--- a/codex-rs/protocol/src/models.rs+++ b/codex-rs/protocol/src/models.rs@@ -34,6 +34,7 @@ use codex_utils_path_uri::PathUri;mod configuration_update;mod executed_tool_calls;+mod item_metadata;pub use crate::local_media::MAX_PROMPT_AUDIO_INPUT_BYTES;@@ -892,6 +893,17 @@ pub enum ContentItem {},OutputText {text: String,+ // Preserve provider metadata, including empty arrays, for sampled-output replay.+ #[serde(default, skip_serializing_if = "Option::is_none")]+ #[ts(optional)]+ #[ts(type = "unknown[]")]+ #[debug(skip)]+ annotations: Option<Vec<serde_json::Value>>,+ #[serde(default, skip_serializing_if = "Option::is_none")]+ #[ts(optional)]+ #[ts(type = "unknown[]")]+ #[debug(skip)]+ logprobs: Option<Vec<serde_json::Value>>,},}@@ -1022,6 +1034,12 @@ pub enum ResponseItem {tools: Vec<serde_json::Value>,},Message {+ #[serde(default, skip_serializing_if = "Option::is_none")]+ #[ts(optional)]+ encrypted_content: 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)]id: Option<ResponseItemId>,@@ -1062,6 +1080,9 @@ pub enum ResponseItem {internal_chat_message_metadata_passthrough: Option<InternalChatMessageMetadataPassthrough>,},LocalShellCall {+ #[serde(default, skip_serializing_if = "Option::is_none")]+ #[ts(optional)]+ encrypted_content: Option<String>,/// Legacy id field retained for compatibility with older payloads.#[serde(default, skip_serializing_if = "Option::is_none")]#[ts(optional)]@@ -1075,6 +1096,12 @@ pub enum ResponseItem {internal_chat_message_metadata_passthrough: Option<InternalChatMessageMetadataPassthrough>,},FunctionCall {+ #[serde(default, skip_serializing_if = "Option::is_none")]+ #[ts(optional)]+ encrypted_content: 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)]id: Option<ResponseItemId>,@@ -1095,6 +1122,9 @@ pub enum ResponseItem {internal_chat_message_metadata_passthrough: Option<InternalChatMessageMetadataPassthrough>,},ToolSearchCall {+ #[serde(default, skip_serializing_if = "Option::is_none")]+ #[ts(optional)]+ encrypted_content: Option<String>,#[serde(default, skip_serializing_if = "Option::is_none")]#[ts(optional)]id: Option<ResponseItemId>,@@ -1135,6 +1165,9 @@ pub enum ResponseItem {internal_chat_message_metadata_passthrough: Option<InternalChatMessageMetadataPassthrough>,},CustomToolCall {+ #[serde(default, skip_serializing_if = "Option::is_none")]+ #[ts(optional)]+ encrypted_content: Option<String>,#[serde(default, skip_serializing_if = "Option::is_none")]#[ts(optional)]id: Option<ResponseItemId>,@@ -1192,6 +1225,9 @@ pub enum ResponseItem {// "action": {"type":"search","query":"weather: San Francisco, CA"}// }WebSearchCall {+ #[serde(default, skip_serializing_if = "Option::is_none")]+ #[ts(optional)]+ encrypted_content: Option<String>,#[serde(default, skip_serializing_if = "Option::is_none")]#[ts(optional)]id: Option<ResponseItemId>,@@ -1215,6 +1251,9 @@ pub enum ResponseItem {// "result":"..."// }ImageGenerationCall {+ #[serde(default, skip_serializing_if = "Option::is_none")]+ #[ts(optional)]+ encrypted_content: Option<String>,#[serde(default, skip_serializing_if = "Option::is_none")]#[ts(optional)]id: Option<ResponseItemId>,@@ -1259,6 +1298,50 @@ pub enum ResponseItem {}impl ResponseItem {+ /// Clears the top-level `encrypted_content` fields.+ pub fn clear_encrypted_content(&mut self) {+ match self {+ Self::Message {+ encrypted_content, ..+ }+ | Self::Reasoning {+ encrypted_content, ..+ }+ | Self::LocalShellCall {+ encrypted_content, ..+ }+ | Self::FunctionCall {+ encrypted_content, ..+ }+ | Self::ToolSearchCall {+ encrypted_content, ..+ }+ | Self::CustomToolCall {+ encrypted_content, ..+ }+ | Self::WebSearchCall {+ encrypted_content, ..+ }+ | Self::ImageGenerationCall {+ encrypted_content, ..+ }+ | Self::ContextCompaction {+ encrypted_content, ..+ } => *encrypted_content = None,+ Self::Compaction {+ encrypted_content, ..+ } => encrypted_content.clear(),+ Self::AdditionalTools { .. }+ | Self::AgentMessage { .. }+ | Self::FunctionCallOutput { .. }+ | Self::CustomToolCallOutput { .. }+ | Self::ToolSearchOutput { .. }+ | Self::ConfigurationUpdate { .. }+ | Self::CompactionTrigger { .. }+ | Self::Other => {}+ }+ }+/// Returns the wire type name for this response item.pub fn item_type(&self) -> &'static str {match self {@@ -1900,6 +1983,8 @@ impl From<ResponseInputItem> for ResponseItem {content,phase,} => Self::Message {+ status: None,+ encrypted_content: None,role,content,id: None,@@ -2555,6 +2640,8 @@ mod tests {let input = ResponseInputItem::Message {role: "assistant".to_string(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: "answer text".to_string(),}],phase: phase.clone(),@@ -2562,9 +2649,13 @@ mod tests {let wire = serde_json::to_value(input)?;let item = ResponseItem::from(serde_json::from_value::<ResponseInputItem>(wire)?);let expected = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "assistant".to_string(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: "answer text".to_string(),}],phase,@@ -2678,6 +2769,8 @@ mod tests {internal_chat_message_metadata_passthrough: Option<InternalChatMessageMetadataPassthrough>,) -> ResponseItem {ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -2796,6 +2889,7 @@ mod tests {assert_eq!(item,ResponseItem::ImageGenerationCall {+ encrypted_content: None,id: Some(ResponseItemId::with_suffix("ig", "123")),status: "completed".to_string(),revised_prompt: Some("A small blue square".to_string()),@@ -2818,6 +2912,7 @@ mod tests {assert_eq!(item,ResponseItem::ImageGenerationCall {+ encrypted_content: None,id: Some(ResponseItemId::with_suffix("ig", "123")),status: "completed".to_string(),revised_prompt: None,@@ -3244,6 +3339,8 @@ mod tests {assert_eq!(item,ResponseItem::FunctionCall {+ status: None,+ encrypted_content: None,id: None,name: "mcp__codex_apps__gmail_get_recent_emails".to_string(),namespace: Some("mcp__codex_apps__gmail".to_string()),@@ -3917,6 +4014,7 @@ mod tests {for (json_literal, expected_id, expected_action, expected_status) in cases {let parsed: ResponseItem = serde_json::from_str(json_literal)?;let expected = ResponseItem::WebSearchCall {+ encrypted_content: None,id: expected_id.clone(),status: expected_status.clone(),action: expected_action.clone(),@@ -4159,6 +4257,7 @@ mod tests {assert_eq!(parsed,ResponseItem::ToolSearchCall {+ encrypted_content: None,id: None,call_id: Some("search-1".to_string()),status: None,@@ -4276,6 +4375,7 @@ mod tests {assert_eq!(parsed_call,ResponseItem::ToolSearchCall {+ encrypted_content: None,id: None,call_id: None,status: Some("completed".to_string()),diff --git a/codex-rs/protocol/src/models/item_metadata_tests.rs b/codex-rs/protocol/src/models/item_metadata_tests.rsindex df8cfadfbd..ad8d66d73e 100644--- a/codex-rs/protocol/src/models/item_metadata_tests.rs+++ b/codex-rs/protocol/src/models/item_metadata_tests.rs@@ -59,6 +59,8 @@ fn malformed_content_kinds_do_not_prevent_loading_response_item() -> Result<()>fn response_item(metadata: InternalChatMessageMetadataPassthrough) -> ResponseItem {ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {diff --git a/codex-rs/protocol/src/protocol.rs b/codex-rs/protocol/src/protocol.rsindex a50269a5b7..17888ed28f 100644--- a/codex-rs/protocol/src/protocol.rs+++ b/codex-rs/protocol/src/protocol.rs@@ -976,6 +976,8 @@ impl InterAgentCommunication {ResponseInputItem::Message {role: "assistant".to_string(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: serde_json::to_string(&communication).unwrap_or_default(),}],phase: Some(MessagePhase::Commentary),@@ -1023,7 +1025,7 @@ impl InterAgentCommunication {pub fn from_message_content(content: &[ContentItem]) -> Option<Self> {match content {- [ContentItem::InputText { text }] | [ContentItem::OutputText { text }] => {+ [ContentItem::InputText { text }] | [ContentItem::OutputText { text, .. }] => {serde_json::from_str(text).ok()}_ => None,@@ -4832,6 +4834,8 @@ mod tests {ResponseInputItem::Message {role: "assistant".to_string(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: serde_json::to_string(&serialized_communication).expect("serialize communication"),}],diff --git a/codex-rs/rollout/src/persistence_metrics_tests.rs b/codex-rs/rollout/src/persistence_metrics_tests.rsindex ceebe75a3c..6753ba512e 100644--- a/codex-rs/rollout/src/persistence_metrics_tests.rs+++ b/codex-rs/rollout/src/persistence_metrics_tests.rs@@ -37,6 +37,8 @@ use crate::policy::PERSISTED_COMMAND_OUTPUT_MAX_BYTES;fn retained_message(text: &str) -> RolloutItem {RolloutItem::ResponseItem(ResponseItemEnvelope::new(ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {diff --git a/codex-rs/rollout/src/search.rs b/codex-rs/rollout/src/search.rsindex b0f1a68f87..77206404e1 100644--- a/codex-rs/rollout/src/search.rs+++ b/codex-rs/rollout/src/search.rs@@ -320,7 +320,9 @@ fn conversation_text_from_item(item: &RolloutItem) -> Option<String> {fn content_item_text(item: &ContentItem) -> Option<&str> {match item {- ContentItem::InputText { text } | ContentItem::OutputText { text } => Some(text.as_str()),+ ContentItem::InputText { text } | ContentItem::OutputText { text, .. } => {+ Some(text.as_str())+ }ContentItem::InputImage { .. } | ContentItem::InputAudio { .. } => None,}}diff --git a/codex-rs/rollout/src/tests.rs b/codex-rs/rollout/src/tests.rsindex 27fd11ba4d..3f61385a97 100644--- a/codex-rs/rollout/src/tests.rs+++ b/codex-rs/rollout/src/tests.rs@@ -1453,6 +1453,8 @@ async fn read_head_for_summary_omits_harness_metadata() {let temp = TempDir::new().unwrap();let rollout_path = temp.path().join("rollout.jsonl");let response_item = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {@@ -1606,9 +1608,13 @@ async fn test_updated_at_uses_file_mtime() -> Result<()> {timestamp: format!("{ts}-{idx:02}"),ordinal: None,item: RolloutItem::ResponseItem(ResponseItemEnvelope::new(ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "assistant".into(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: format!("reply-{idx}"),}],phase: None,diff --git a/codex-rs/state/src/extract.rs b/codex-rs/state/src/extract.rsindex a6109bb307..f079ebc4ee 100644--- a/codex-rs/state/src/extract.rs+++ b/codex-rs/state/src/extract.rs@@ -258,6 +258,8 @@ mod tests {let mut metadata = metadata_for_test();let item = RolloutItem::ResponseItem(ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {diff --git a/codex-rs/thread-store/src/local/mod.rs b/codex-rs/thread-store/src/local/mod.rsindex 1380ff5bac..5ec4719cc2 100644--- a/codex-rs/thread-store/src/local/mod.rs+++ b/codex-rs/thread-store/src/local/mod.rs@@ -1699,6 +1699,8 @@ mod tests {let late_edit = RolloutItem::ResponseItem(ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {diff --git a/codex-rs/thread-store/src/local/model_context_tests.rs b/codex-rs/thread-store/src/local/model_context_tests.rsindex 3e74f2bb2a..acf0c28a33 100644--- a/codex-rs/thread-store/src/local/model_context_tests.rs+++ b/codex-rs/thread-store/src/local/model_context_tests.rs@@ -643,6 +643,8 @@ fn turn_complete(turn_id: &str) -> RolloutItem {fn user_message(message: &str) -> RolloutItem {RolloutItem::ResponseItem(ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {diff --git a/codex-rs/thread-store/src/local/rollout_migration_tests.rs b/codex-rs/thread-store/src/local/rollout_migration_tests.rsindex 043ed572ea..e06cac6b02 100644--- a/codex-rs/thread-store/src/local/rollout_migration_tests.rs+++ b/codex-rs/thread-store/src/local/rollout_migration_tests.rs@@ -174,6 +174,8 @@ fn agent_message(text: &str) -> RolloutItem {fn input_response_message(role: &str, text: &str) -> ResponseItem {ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: role.to_string(),content: vec![ContentItem::InputText {@@ -935,6 +937,8 @@ async fn migration_coalesces_response_first_user_message_rollback_boundary() {let thread_id = ThreadId::new();let file_id = "file_123".to_string();let response = ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![@@ -1183,9 +1187,13 @@ async fn migration_rolls_back_pre_compaction_turns_from_sqlite_history() {let RolloutItem::Compacted(mut checkpoint) = compacted(vec![input_response_message("user", "old question"),ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "assistant".to_string(),content: vec![ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: "old answer".to_string(),}],phase: None,@@ -1584,7 +1592,7 @@ async fn migration_keeps_downgraded_delivery_before_later_same_turn_steer() {RolloutItem::ResponseItem(envelope)if matches!(&envelope.item, ResponseItem::Message { role, content, .. }if role == "assistant"- && matches!(content.as_slice(), [ContentItem::OutputText { text }]+ && matches!(content.as_slice(), [ContentItem::OutputText { text , .. }]if text == "May I publish?")))));}@@ -1640,6 +1648,8 @@ async fn assert_migrated_evidence_order(steer_order: Option<u64>) {let thread_id = ThreadId::new();let [initial, steer] =[("initial", INITIAL), ("steer", STEER)].map(|(id, text)| ResponseItem::Message {+ status: None,+ encrypted_content: None,id: Some(ResponseItemId::with_suffix("msg", id)),role: "user".to_owned(),content: vec![ContentItem::InputText {@@ -2078,6 +2088,8 @@ async fn migration_compacts_subagent_prefix_and_does_not_project_it() {message: "latest checkpoint".to_string(),replacement_history: Some(vec![ResponseItem::Message {+ encrypted_content: None,+ status: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {diff --git a/codex-rs/thread-store/src/local/thread_history_materialization_tests.rs b/codex-rs/thread-store/src/local/thread_history_materialization_tests.rsindex c711043c99..0d260df188 100644--- a/codex-rs/thread-store/src/local/thread_history_materialization_tests.rs+++ b/codex-rs/thread-store/src/local/thread_history_materialization_tests.rs@@ -2875,6 +2875,8 @@ fn turn_completed(turn_id: &str) -> RolloutItem {fn user_message(message: &str) -> RolloutItem {RolloutItem::ResponseItem(ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {diff --git a/codex-rs/tools/src/response_history.rs b/codex-rs/tools/src/response_history.rsindex ab16769afd..307dbf3163 100644--- a/codex-rs/tools/src/response_history.rs+++ b/codex-rs/tools/src/response_history.rs@@ -49,7 +49,7 @@ pub fn truncate_assistant_output_text_to_token_budget(}content.retain_mut(|content_item| {- let ContentItem::OutputText { text } = content_item else {+ let ContentItem::OutputText { text, .. } = content_item else {return true;};if remaining_budget == 0 {@@ -83,10 +83,14 @@ mod tests {fn message(role: &str, text: &str) -> ResponseItem {ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: role.to_string(),content: vec![if role == "assistant" {ContentItem::OutputText {+ annotations: None,+ logprobs: None,text: text.to_string(),}} else {diff --git a/codex-rs/tools/src/tool_output.rs b/codex-rs/tools/src/tool_output.rsindex 296c31211c..31a74136d8 100644--- a/codex-rs/tools/src/tool_output.rs+++ b/codex-rs/tools/src/tool_output.rs@@ -225,7 +225,7 @@ fn response_input_to_code_mode_result(response: ResponseInputItem) -> JsonValue.into_iter().map(|item| match item {codex_protocol::models::ContentItem::InputText { text }- | codex_protocol::models::ContentItem::OutputText { text } => {+ | codex_protocol::models::ContentItem::OutputText { text, .. } => {FunctionCallOutputContentItem::InputText { text }}codex_protocol::models::ContentItem::InputImage { image, detail } => {diff --git a/codex-rs/tui/src/app/side.rs b/codex-rs/tui/src/app/side.rsindex 428ea96900..8ac0adfeab 100644--- a/codex-rs/tui/src/app/side.rs+++ b/codex-rs/tui/src/app/side.rs@@ -614,6 +614,8 @@ impl App {pub(super) fn side_boundary_prompt_item() -> ResponseItem {ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![ContentItem::InputText {diff --git a/codex-rs/utils/audio/src/audio_preparation_tests.rs b/codex-rs/utils/audio/src/audio_preparation_tests.rsindex 3a7276996b..c1849bcb8d 100644--- a/codex-rs/utils/audio/src/audio_preparation_tests.rs+++ b/codex-rs/utils/audio/src/audio_preparation_tests.rs@@ -7,6 +7,8 @@ use super::*;#[test]fn preparation_canonicalizes_data_urls_and_rejects_remote_urls() {let mut items = vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![@@ -29,6 +31,8 @@ fn preparation_canonicalizes_data_urls_and_rejects_remote_urls() {assert_eq!(items,vec![ResponseItem::Message {+ encrypted_content: None,+ status: None,id: None,role: "user".to_string(),content: vec![@@ -51,6 +55,8 @@ fn preparation_canonicalizes_data_urls_and_rejects_remote_urls() {#[test]fn preparation_replaces_invalid_message_audio_with_placeholders() {let mut items = vec![ResponseItem::Message {+ status: None,+ encrypted_content: None,id: None,role: "user".to_string(),content: vec![@@ -70,6 +76,8 @@ fn preparation_replaces_invalid_message_audio_with_placeholders() {assert_eq!(items,vec![ResponseItem::Message {+ encrypted_content: None,+ status: None,id: None,role: "user".to_string(),content: vec![diff --git a/sdk/python/src/openai_codex/generated/v2_all.py b/sdk/python/src/openai_codex/generated/v2_all.pyindex 20ce047fb5..0faaa9e074 100644--- a/sdk/python/src/openai_codex/generated/v2_all.py+++ b/sdk/python/src/openai_codex/generated/v2_all.py@@ -1128,6 +1128,8 @@ class OutputTextContentItem(BaseModel):model_config = ConfigDict(populate_by_name=True,)+ annotations: list | None = None+ logprobs: list | None = Nonetext: strtype: Annotated[Literal["output_text"], Field(title="OutputTextContentItemType")]@@ -3993,6 +3995,7 @@ class LocalShellCallResponseItem(BaseModel):)action: LocalShellActioncall_id: Annotated[str | None, Field(description="Set when using the Responses API.")] = None+ encrypted_content: str | None = Noneid: Annotated[str | None,Field(description="Legacy id field retained for compatibility with older payloads."),@@ -4008,11 +4011,13 @@ class FunctionCallResponseItem(BaseModel):)arguments: strcall_id: str+ encrypted_content: str | None = Noneencrypted_function_args: list[str] | None = Noneid: str | None = Noneinternal_chat_message_metadata_passthrough: InternalChatMessageMetadataPassthrough | None = Nonename: strnamespace: str | None = None+ status: str | None = Nonetype: Annotated[Literal["function_call"], Field(title="FunctionCallResponseItemType")]@@ -4022,6 +4027,7 @@ class ToolSearchCallResponseItem(BaseModel):)arguments: Anycall_id: str | None = None+ encrypted_content: str | None = Noneexecution: strid: str | None = Noneinternal_chat_message_metadata_passthrough: InternalChatMessageMetadataPassthrough | None = None@@ -4034,6 +4040,7 @@ class CustomToolCallResponseItem(BaseModel):populate_by_name=True,)call_id: str+ encrypted_content: str | None = Noneid: str | None = Noneinput: strinternal_chat_message_metadata_passthrough: InternalChatMessageMetadataPassthrough | None = None@@ -4060,6 +4067,7 @@ class ImageGenerationCallResponseItem(BaseModel):model_config = ConfigDict(populate_by_name=True,)+ encrypted_content: str | None = Noneid: str | None = Noneinternal_chat_message_metadata_passthrough: InternalChatMessageMetadataPassthrough | None = Noneresult: str@@ -9145,10 +9153,12 @@ class MessageResponseItem(BaseModel):populate_by_name=True,)content: list[ContentItem]+ encrypted_content: str | None = Noneid: str | None = Noneinternal_chat_message_metadata_passthrough: InternalChatMessageMetadataPassthrough | None = Nonephase: MessagePhase | None = Nonerole: str+ status: str | None = Nonetype: Annotated[Literal["message"], Field(title="MessageResponseItemType")]@@ -9157,6 +9167,7 @@ class WebSearchCallResponseItem(BaseModel):populate_by_name=True,)action: ResponsesApiWebSearchAction | None = None+ encrypted_content: str | None = Noneid: str | None = Noneinternal_chat_message_metadata_passthrough: InternalChatMessageMetadataPassthrough | None = Nonestatus: str | None = None