Lightweight coding agent that runs in your terminal
Rust
Remove per-content source attribution metadata (#52329)
Adam Perry @ OpenAI806d2d1cc194
diff --git a/codex-rs/app-server/tests/suite/v2/history_notes_extension.rs b/codex-rs/app-server/tests/suite/v2/history_notes_extension.rsindex bc12a8b839..177590a6a2 100644--- a/codex-rs/app-server/tests/suite/v2/history_notes_extension.rs+++ b/codex-rs/app-server/tests/suite/v2/history_notes_extension.rs@@ -205,11 +205,7 @@ async fn app_server_uses_configured_notes_backend_for_context_window_hints(}).count();assert_eq!(bridge_calls, usize::from(!use_history_notes_extension));- let developer_messages: Vec<_> = request- .message_input_text_groups("developer")- .into_iter()- .map(|parts| parts.concat())- .collect();+ let developer_messages = request.message_input_texts("developer");let context_window = developer_messages.iter().find(|text| text.contains("<context_window>"))diff --git a/codex-rs/codex-mcp/src/lib.rs b/codex-rs/codex-mcp/src/lib.rsindex df2b6558b9..9d7ccab32f 100644--- a/codex-rs/codex-mcp/src/lib.rs+++ b/codex-rs/codex-mcp/src/lib.rs@@ -27,7 +27,6 @@ pub use runtime::McpRuntime;pub use runtime::McpRuntimeContext;pub use runtime::McpRuntimeInput;pub use runtime::McpStartupPolicy;-pub use runtime::McpToolCallResult;pub use runtime::SandboxState;pub use runtime::apply_http_headers_helper;pub use tool_catalog_cache::McpToolCatalogCache;diff --git a/codex-rs/codex-mcp/src/runtime.rs b/codex-rs/codex-mcp/src/runtime.rsindex 483cfc618b..a37f3cc9f4 100644--- a/codex-rs/codex-mcp/src/runtime.rs+++ b/codex-rs/codex-mcp/src/runtime.rs@@ -75,13 +75,6 @@ pub enum McpStartupPolicy {LazyWhenCached,}-/// A host-requested tool result and its identity in the published MCP catalog.-pub struct McpToolCallResult {- pub result: CallToolResult,- /// None when no retained binding identifies the tool. This is not MCP wire metadata.- pub source_tool_namespace: Option<String>,-}-/// Configuration and owning-thread state needed to materialize an MCP runtime.pub struct McpRuntimeInput {pub startup_policy: McpStartupPolicy,@@ -650,18 +643,6 @@ impl McpRuntime {self.latest_connections().list_all_tools().await}- pub async fn latest_read_resource(- &self,- server: &str,- params: ReadResourceRequestParams,- ) -> anyhow::Result<ReadResourceResult> {- self.latest_connections()- .read_resource(server, params)- .await- }-- /// Calls a tool for the host and reports its callable namespace from the same runtime.- /// Missing cached identity never blocks execution; its namespace remains unknown.#[allow(clippy::too_many_arguments)]pub async fn latest_call_tool(&self,@@ -672,23 +653,8 @@ impl McpRuntime {meta: Option<serde_json::Value>,requested_timeout: Option<Duration>,wait_for_server: bool,- ) -> anyhow::Result<McpToolCallResult> {- let current = self.current.load_full();- // Attribution must never delay a successful call. The binding is immutable;- // if it does not describe this host-only tool, keep its namespace unknown.- let namespace = current- .cached_binding- .lock()- .unwrap_or_else(std::sync::PoisonError::into_inner)- .as_ref()- .and_then(|cached| cached.binding.upgrade())- .and_then(|binding| {- binding- .tool_info(server, tool)- .map(|info| info.callable_namespace.clone())- });- let result = current- .connections+ ) -> anyhow::Result<CallToolResult> {+ self.latest_connections().call_tool(server,tool,@@ -698,11 +664,17 @@ impl McpRuntime {requested_timeout,wait_for_server,)- .await?;- Ok(McpToolCallResult {- result,- source_tool_namespace: namespace,- })+ .await+ }++ pub async fn latest_read_resource(+ &self,+ server: &str,+ params: ReadResourceRequestParams,+ ) -> anyhow::Result<ReadResourceResult> {+ self.latest_connections()+ .read_resource(server, params)+ .await}pub async fn latest_wait_for_server_ready(&self, server: &str, timeout: Duration) -> bool {diff --git a/codex-rs/context-fragments/src/annotated_content.rs b/codex-rs/context-fragments/src/annotated_content.rsindex 78e8ea8ce9..8f02a9240c 100644--- a/codex-rs/context-fragments/src/annotated_content.rs+++ b/codex-rs/context-fragments/src/annotated_content.rs@@ -1,37 +1,23 @@use codex_protocol::models::ContentItem;use codex_protocol::models::ContentItemKind;-use codex_protocol::models::ContentItemMetadata;use codex_protocol::models::ResponseItem;-/// Content, classification and attribution travel together through edits and truncation.+/// Model-visible content paired with its harness-owned classification.#[derive(Clone, Debug, PartialEq)]pub struct AnnotatedContent {content: ContentItem,kind: ContentItemKind,- metadata: ContentItemMetadata,}impl AnnotatedContent {/// Creates content and its classification together.pub fn new(content: ContentItem, kind: ContentItemKind) -> Self {- Self {- content,- kind,- metadata: ContentItemMetadata::default(),- }+ Self { content, kind }}- /// Creates text with the attribution supplied by its producer.- pub fn text(- text: impl Into<String>,- kind: ContentItemKind,- metadata: ContentItemMetadata,- ) -> Self {- Self {- content: ContentItem::InputText { text: text.into() },- kind,- metadata,- }+ /// Creates model-visible input text and its classification together.+ pub fn input_text(text: impl Into<String>, kind: ContentItemKind) -> Self {+ Self::new(ContentItem::InputText { text: text.into() }, kind)}/// Returns the model-visible content.@@ -49,29 +35,16 @@ impl AnnotatedContent {&self.kind}- /// Separates content and its positional annotations at an API boundary.- pub fn into_parts(self) -> (ContentItem, ContentItemKind, ContentItemMetadata) {- (self.content, self.kind, self.metadata)+ /// Separates the content from its classification at an API boundary.+ pub fn into_parts(self) -> (ContentItem, ContentItemKind) {+ (self.content, self.kind)}}-/// Assembles a message without separating its content from its attribution.-pub fn message_from_parts(role: impl Into<String>, parts: Vec<AnnotatedContent>) -> ResponseItem {- let mut item = ResponseItem::Message {- id: None,- role: role.into(),- content: Vec::new(),- phase: None,- internal_chat_message_metadata_passthrough: None,- };- set_annotated_content(&mut item, parts);- item-}--/// Takes a message's content together with its classification and source metadata.+/// Takes a message's content together with its positional classifications.////// Legacy messages, including persisted rollouts, may not have classifications.-/// Missing entries have unknown classification and source so the message remains usable.+/// Missing entries are classified as unknown so the message remains usable.pub fn to_annotated_content(item: &mut ResponseItem) -> Option<Vec<AnnotatedContent>> {let ResponseItem::Message {content,@@ -86,10 +59,6 @@ pub fn to_annotated_content(item: &mut ResponseItem) -> Option<Vec<AnnotatedCont.as_mut().and_then(|metadata| metadata.content_item_kinds.take()).unwrap_or_default();- let metadata = internal_chat_message_metadata_passthrough- .as_mut()- .and_then(|metadata| metadata.content_item_metadata.take())- .unwrap_or_default();Some(std::mem::take(content)@@ -97,21 +66,12 @@ pub fn to_annotated_content(item: &mut ResponseItem) -> Option<Vec<AnnotatedCont.zip(kinds.into_iter().chain(std::iter::repeat_with(|| {ContentItemKind("unknown".to_string())})))- .zip(- metadata- .into_iter()- .chain(std::iter::repeat_with(ContentItemMetadata::default)),- )- .map(|((content, kind), metadata)| AnnotatedContent {- content,- kind,- metadata,- })+ .map(|(content, kind)| AnnotatedContent::new(content, kind)).collect(),)}-/// Replaces content and its positional annotations together.+/// Replaces a message's content and positional classifications together.pub fn set_annotated_content(item: &mut ResponseItem,annotated_content: Vec<AnnotatedContent>,@@ -125,22 +85,14 @@ pub fn set_annotated_content(return None;};- let mut updated_content = Vec::with_capacity(annotated_content.len());- let mut content_item_kinds = Vec::with_capacity(annotated_content.len());- let mut content_item_metadata = Vec::with_capacity(annotated_content.len());- for annotated in annotated_content {- let (content, kind, metadata) = annotated.into_parts();- updated_content.push(content);- content_item_kinds.push(kind);- content_item_metadata.push(metadata);- }+ let (updated_content, content_item_kinds): (Vec<_>, Vec<_>) = annotated_content+ .into_iter()+ .map(AnnotatedContent::into_parts)+ .unzip();*content = updated_content;- let metadata = internal_chat_message_metadata_passthrough.get_or_insert_default();- metadata.content_item_kinds = Some(content_item_kinds);- metadata.content_item_metadata = content_item_metadata- .iter()- .any(|metadata| metadata != &ContentItemMetadata::default())- .then_some(content_item_metadata);+ internal_chat_message_metadata_passthrough+ .get_or_insert_default()+ .content_item_kinds = Some(content_item_kinds);Some(())}diff --git a/codex-rs/context-fragments/src/fragment.rs b/codex-rs/context-fragments/src/fragment.rsindex 8d681dddab..f01a4a66e4 100644--- a/codex-rs/context-fragments/src/fragment.rs+++ b/codex-rs/context-fragments/src/fragment.rs@@ -1,7 +1,6 @@use crate::AnnotatedContent;-use crate::message_from_parts;use codex_protocol::models::ContentItemKind;-use codex_protocol::models::ContentItemMetadata;+use codex_protocol::models::InternalChatMessageMetadataPassthrough;use codex_protocol::models::ResponseItem;/// A rendered contextual fragment and the role that owns its annotated content.@@ -36,7 +35,20 @@ impl RenderedFragment {impl From<RenderedFragment> for ResponseItem {fn from(fragment: RenderedFragment) -> Self {let (role, annotated_content) = fragment.into_parts();- message_from_parts(role, vec![annotated_content])+ let (content, content_kind) = annotated_content.into_parts();++ Self::Message {+ id: None,+ role: role.to_string(),+ content: vec![content],+ phase: None,+ internal_chat_message_metadata_passthrough: Some(+ InternalChatMessageMetadataPassthrough {+ content_item_kinds: Some(vec![content_kind]),+ ..Default::default()+ },+ ),+ }}}@@ -52,22 +64,6 @@ impl From<RenderedFragment> for ResponseItem {pub trait ContextualUserFragment {fn role(&self) -> &'static str;- /// Attribution is supplied when the fragment is produced, never inferred from rendered text.- fn content_metadata(&self) -> ContentItemMetadata {- ContentItemMetadata::harness()- }-- /// Binds producer attribution before this fragment is rendered or persisted.- fn with_metadata(self, metadata: ContentItemMetadata) -> AttributedFragment<Self>- where- Self: Sized,- {- AttributedFragment {- fragment: self,- metadata,- }- }-/// Returns a stable `<feature>.<name>` classification, using `generic` for shared fragments.fn content_kind(&self) -> ContentItemKind;@@ -101,7 +97,7 @@ pub trait ContextualUserFragment {fn render_fragment(&self) -> RenderedFragment {RenderedFragment::new(self.role(),- AnnotatedContent::text(self.render(), self.content_kind(), self.content_metadata()),+ AnnotatedContent::input_text(self.render(), self.content_kind()),)}@@ -117,36 +113,6 @@ pub trait ContextualUserFragment {}}-/// A contextual fragment with attribution supplied by its producer.-pub struct AttributedFragment<F> {- fragment: F,- metadata: ContentItemMetadata,-}--impl<F: ContextualUserFragment> ContextualUserFragment for AttributedFragment<F> {- fn role(&self) -> &'static str {- self.fragment.role()- }- fn content_kind(&self) -> ContentItemKind {- self.fragment.content_kind()- }- fn markers(&self) -> (&'static str, &'static str) {- self.fragment.markers()- }- fn type_markers() -> (&'static str, &'static str) {- F::type_markers()- }- fn body(&self) -> String {- self.fragment.body()- }- fn render(&self) -> String {- self.fragment.render()- }- fn content_metadata(&self) -> ContentItemMetadata {- self.metadata.clone()- }-}-pub(crate) fn matches_marked_text(start_marker: &str, end_marker: &str, text: &str) -> bool {if start_marker.is_empty() || end_marker.is_empty() {return false;diff --git a/codex-rs/context-fragments/src/lib.rs b/codex-rs/context-fragments/src/lib.rsindex 92e087029a..5f2b266cf4 100644--- a/codex-rs/context-fragments/src/lib.rs+++ b/codex-rs/context-fragments/src/lib.rs@@ -8,10 +8,8 @@ mod recap_prompt;pub use additional_context::AdditionalContextDeveloperFragment;pub use additional_context::AdditionalContextUserFragment;pub use annotated_content::AnnotatedContent;-pub use annotated_content::message_from_parts;pub use annotated_content::set_annotated_content;pub use annotated_content::to_annotated_content;-pub use fragment::AttributedFragment;pub use fragment::ContextualUserFragment;pub use fragment::RenderedFragment;diff --git a/codex-rs/core/src/agent/control.rs b/codex-rs/core/src/agent/control.rsindex 8da7b524c1..895cd26802 100644--- a/codex-rs/core/src/agent/control.rs+++ b/codex-rs/core/src/agent/control.rs@@ -11,7 +11,6 @@ use crate::agent_communication::AgentCommunicationContext;use crate::agent_communication::AgentCommunicationKind;use crate::config::Config;use crate::config::RolloutBudgetConfig;-use crate::context::ContextualUserFragment;use crate::context::SubagentNotification;use crate::environment_selection::TurnEnvironmentSnapshot;use crate::session::emit_subagent_session_started;@@ -33,8 +32,6 @@ use codex_protocol::error::Result as CodexResult;use codex_protocol::items::SubAgentActivityItem;use codex_protocol::items::TurnItem;use codex_protocol::models::ContentItem;-use codex_protocol::models::ContentItemMetadata;-use codex_protocol::models::ContentItemNamespace;use codex_protocol::models::MessagePhase;use codex_protocol::models::ResponseItem;use codex_protocol::protocol::Event;@@ -553,27 +550,11 @@ impl LocalAgentControl {let Ok(parent_thread) = state.get_thread(parent_thread_id).await else {return;};- let config = parent_thread.config().await;- let namespace = match parent_thread- .multi_agent_version()- .unwrap_or_else(|| config.multi_agent_version_from_features())- {- MultiAgentVersion::Disabled => None,- MultiAgentVersion::V1 => Some(ContentItemNamespace::MultiAgentV1),- MultiAgentVersion::V2 => Some(- config- .multi_agent_v2- .tool_namespace- .clone()- .map(ContentItemNamespace::from)- .unwrap_or(ContentItemNamespace::Functions),- ),- };parent_thread- .inject_fragment_without_turn(- SubagentNotification::new(child_reference.as_str(), status)- .with_metadata(ContentItemMetadata::tool(namespace)),- )+ .inject_fragment_without_turn(SubagentNotification::new(+ child_reference.as_str(),+ status,+ )).await;};tokio::spawn(async move {diff --git a/codex-rs/core/src/client.rs b/codex-rs/core/src/client.rsindex 8a7c64f7eb..085a6bd52f 100644--- a/codex-rs/core/src/client.rs+++ b/codex-rs/core/src/client.rs@@ -996,12 +996,6 @@ impl ModelClient {prefix.push(instructions);}input.splice(0..0, prefix);- if !model_info.use_responses_lite {- // Only RLite accepts per-content attribution until the Responses API schema expands.- for item in &mut input {- item.clear_content_item_metadata();- }- }if !is_openai {for item in &mut input {item.clear_internal_chat_message_metadata_passthrough();diff --git a/codex-rs/core/src/codex_thread.rs b/codex-rs/core/src/codex_thread.rsindex df6e64a778..8d2cd8351a 100644--- a/codex-rs/core/src/codex_thread.rs+++ b/codex-rs/core/src/codex_thread.rs@@ -1209,7 +1209,6 @@ impl CodexThread {/*requested_timeout*/ None, /*wait_for_server*/ true,).await- .map(|call| call.result)}pub fn enabled(&self, feature: Feature) -> bool {diff --git a/codex-rs/core/src/compact.rs b/codex-rs/core/src/compact.rsindex 2ec9950e2f..f4db71b688 100644--- a/codex-rs/core/src/compact.rs+++ b/codex-rs/core/src/compact.rs@@ -716,9 +716,6 @@ fn build_compacted_history_with_limit(content.clone()} else {// Rebuild only the text fallback; never clone discarded media.- if let Some(metadata) = &mut passthrough {- metadata.content_item_metadata = None;- }if let Some(kinds) = passthrough.as_mut().and_then(|metadata| metadata.content_item_kinds.as_mut())diff --git a/codex-rs/core/src/context/contextual_user_message_tests.rs b/codex-rs/core/src/context/contextual_user_message_tests.rsindex 5c564fb960..cc6772d8f9 100644--- a/codex-rs/core/src/context/contextual_user_message_tests.rs+++ b/codex-rs/core/src/context/contextual_user_message_tests.rs@@ -171,7 +171,6 @@ fn detects_hook_prompt_fragment_and_roundtrips_escaping() {vec![HookPromptFragment {text: r#"Retry with "waves" & <tides>"#.to_string(),hook_run_id: "hook-run-1".to_string(),- metadata: Default::default(),}],);assert!(!text.contains(""waves" & <tides>"));diff --git a/codex-rs/core/src/context/current_time_reminder.rs b/codex-rs/core/src/context/current_time_reminder.rsindex 4eb7ff43a8..2273cbc04c 100644--- a/codex-rs/core/src/context/current_time_reminder.rs+++ b/codex-rs/core/src/context/current_time_reminder.rs@@ -3,8 +3,6 @@ use chrono::Utc;use super::ContextualUserFragment;use codex_protocol::models::ContentItemKind;-use codex_protocol::models::ContentItemMetadata;-use codex_protocol::models::ContentItemNamespace;pub(crate) struct CurrentTimeReminder {current_time: DateTime<Utc>,@@ -23,10 +21,6 @@ impl CurrentTimeReminder {}impl ContextualUserFragment for CurrentTimeReminder {- fn content_metadata(&self) -> ContentItemMetadata {- ContentItemMetadata::tool(Some(ContentItemNamespace::Clock))- }-fn content_kind(&self) -> ContentItemKind {ContentItemKind("current_time.reminder".to_string())}@@ -55,10 +49,6 @@ impl CurrentTimeUnavailable {}impl ContextualUserFragment for CurrentTimeUnavailable {- fn content_metadata(&self) -> ContentItemMetadata {- ContentItemMetadata::tool(Some(ContentItemNamespace::Clock))- }-fn content_kind(&self) -> ContentItemKind {ContentItemKind("current_time.unavailable".to_string())}diff --git a/codex-rs/core/src/context/developer_instructions.rs b/codex-rs/core/src/context/developer_instructions.rsindex bd42a600fc..6ccb83e85a 100644--- a/codex-rs/core/src/context/developer_instructions.rs+++ b/codex-rs/core/src/context/developer_instructions.rs@@ -1,6 +1,5 @@use super::ContextualUserFragment;use codex_protocol::models::ContentItemKind;-use codex_protocol::models::ContentItemMetadata;#[derive(Debug, Clone, PartialEq, Eq)]pub(crate) struct DeveloperInstructions {@@ -16,10 +15,6 @@ impl DeveloperInstructions {}impl ContextualUserFragment for DeveloperInstructions {- fn content_metadata(&self) -> ContentItemMetadata {- ContentItemMetadata::developer_instructions(/*from_additional_requirements*/ false)- }-fn content_kind(&self) -> ContentItemKind {ContentItemKind("generic.developer_instructions".to_string())}diff --git a/codex-rs/core/src/context/hook_additional_context.rs b/codex-rs/core/src/context/hook_additional_context.rsindex d3117c2e9d..9fe2bcc299 100644--- a/codex-rs/core/src/context/hook_additional_context.rs+++ b/codex-rs/core/src/context/hook_additional_context.rs@@ -1,16 +1,14 @@use super::ContextualUserFragment;-use codex_hooks::HookContext;use codex_protocol::models::ContentItemKind;-use codex_protocol::models::ContentItemMetadata;#[derive(Debug, Clone, PartialEq)]pub(crate) struct HookAdditionalContext {- context: HookContext,+ text: String,}impl HookAdditionalContext {- pub(crate) fn new(context: HookContext) -> Self {- Self { context }+ pub(crate) fn new(text: impl Into<String>) -> Self {+ Self { text: text.into() }}}@@ -32,10 +30,6 @@ impl ContextualUserFragment for HookAdditionalContext {}fn body(&self) -> String {- self.context.text.clone()- }-- fn content_metadata(&self) -> ContentItemMetadata {- self.context.metadata.clone()+ self.text.clone()}}diff --git a/codex-rs/core/src/context/token_budget_context.rs b/codex-rs/core/src/context/token_budget_context.rsindex 04fb4cb549..dd984505b0 100644--- a/codex-rs/core/src/context/token_budget_context.rs+++ b/codex-rs/core/src/context/token_budget_context.rs@@ -3,12 +3,8 @@ use super::world_state::PreviousSectionState;use super::world_state::WorldStateSection;use crate::context::world_state::SectionTransition;use crate::context::world_state::WorldStateUpdate;-use codex_context_fragments::AnnotatedContent;-use codex_context_fragments::message_from_parts;use codex_protocol::AgentPath;-use codex_protocol::models::ContentItem;use codex_protocol::models::ContentItemKind;-use codex_protocol::models::ResponseItem;use codex_protocol::protocol::CONTEXT_WINDOW_CLOSE_TAG;use codex_protocol::protocol::CONTEXT_WINDOW_GUIDANCE_CLOSE_TAG;use codex_protocol::protocol::CONTEXT_WINDOW_GUIDANCE_OPEN_TAG;@@ -21,6 +17,7 @@ pub(crate) struct TokenBudgetContext {first_window_id: Uuid,previous_window_id: Option<Uuid>,window_id: Uuid,+ thread_hint: Option<String>,}impl TokenBudgetContext {@@ -29,39 +26,16 @@ impl TokenBudgetContext {first_window_id: Uuid,previous_window_id: Option<Uuid>,window_id: Uuid,+ thread_hint: Option<String>,) -> Self {Self {agent_path,first_window_id,previous_window_id,window_id,+ thread_hint,}}-- /// Wraps tool hints without losing their source or changing the concatenated prompt text.- pub(crate) fn render_with_hints(&self, hints: Vec<AnnotatedContent>) -> ResponseItem {- if hints.is_empty() {- return ContextualUserFragment::into(self.clone());- }- let mut content = vec![AnnotatedContent::text(- format!("{CONTEXT_WINDOW_OPEN_TAG}{}", self.body()),- self.content_kind(),- self.content_metadata(),- )];- for mut part in hints {- let ContentItem::InputText { text } = part.content_mut() else {- unreachable!("context-window hints are text prompt fragments");- };- text.push('\n');- content.push(part);- }- content.push(AnnotatedContent::text(- CONTEXT_WINDOW_CLOSE_TAG,- self.content_kind(),- self.content_metadata(),- ));- message_from_parts(self.role(), content)- }}impl ContextualUserFragment for TokenBudgetContext {@@ -92,6 +66,9 @@ impl ContextualUserFragment for TokenBudgetContext {if let Some(previous_window_id) = self.previous_window_id {lines.push(format!("Previous context window id: {previous_window_id}"));}+ if let Some(thread_hint) = &self.thread_hint {+ lines.push(thread_hint.clone());+ }format!("\n{}\n", lines.join("\n"))}}diff --git a/codex-rs/core/src/context/user_instructions.rs b/codex-rs/core/src/context/user_instructions.rsindex 2ceecbf7c5..f75cb24d57 100644--- a/codex-rs/core/src/context/user_instructions.rs+++ b/codex-rs/core/src/context/user_instructions.rs@@ -1,6 +1,5 @@use super::ContextualUserFragment;use codex_protocol::models::ContentItemKind;-use codex_protocol::models::ContentItemMetadata;#[derive(Debug, Clone, PartialEq)]pub(crate) struct UserInstructions {@@ -9,10 +8,6 @@ pub(crate) struct UserInstructions {}impl ContextualUserFragment for UserInstructions {- fn content_metadata(&self) -> ContentItemMetadata {- ContentItemMetadata::agents_md()- }-fn content_kind(&self) -> ContentItemKind {ContentItemKind("agents_md.instructions".to_string())}diff --git a/codex-rs/core/src/context/world_state/managed_developer_instructions.rs b/codex-rs/core/src/context/world_state/managed_developer_instructions.rsindex be5bc85f5f..e59bcef834 100644--- a/codex-rs/core/src/context/world_state/managed_developer_instructions.rs+++ b/codex-rs/core/src/context/world_state/managed_developer_instructions.rs@@ -6,7 +6,6 @@ use super::WorldStateUpdate;use crate::context::ContextualUserFragment;use codex_config::Sourced;use codex_protocol::models::ContentItemKind;-use codex_protocol::models::ContentItemMetadata;use codex_utils_string::approx_bytes_for_tokens;use codex_utils_string::approx_tokens_from_byte_count;use serde::Deserialize;@@ -25,10 +24,6 @@ pub(crate) struct ManagedDeveloperInstructions {}impl ContextualUserFragment for ManagedDeveloperInstructions {- fn content_metadata(&self) -> ContentItemMetadata {- ContentItemMetadata::developer_instructions(/*from_additional_requirements*/ true)- }-fn content_kind(&self) -> ContentItemKind {ContentItemKind("managed_config.developer_instructions".to_string())}diff --git a/codex-rs/core/src/context/world_state/mod.rs b/codex-rs/core/src/context/world_state/mod.rsindex 6a23a30c15..857649f662 100644--- a/codex-rs/core/src/context/world_state/mod.rs+++ b/codex-rs/core/src/context/world_state/mod.rs@@ -278,10 +278,6 @@ struct WorldStateContextFragment {}impl ContextualUserFragment for WorldStateContextFragment {- fn content_metadata(&self) -> codex_protocol::models::ContentItemMetadata {- self.fragment.metadata().clone()- }-fn content_kind(&self) -> ContentItemKind {self.content_kind.clone()}diff --git a/codex-rs/core/src/context/world_state/model_catalog.rs b/codex-rs/core/src/context/world_state/model_catalog.rsindex 3f768b3b21..b46c9bf774 100644--- a/codex-rs/core/src/context/world_state/model_catalog.rs+++ b/codex-rs/core/src/context/world_state/model_catalog.rs@@ -12,8 +12,6 @@ use crate::agent::child_config::model_supports_multi_agent_backend;use crate::context::ContextualUserFragment;use crate::context::environment_context::push_xml_escaped_text;use codex_protocol::models::ContentItemKind;-use codex_protocol::models::ContentItemMetadata;-use codex_protocol::models::ContentItemNamespace;use codex_protocol::openai_models::ModelPreset;use codex_protocol::protocol::MultiAgentVersion;@@ -26,7 +24,6 @@ const OMITTED_NOTICE: &str = "Additional model choices omitted.\n";#[derive(Clone, Default)]pub(crate) struct ModelCatalogState {catalog: String,- namespace: Option<ContentItemNamespace>,}impl ModelCatalogState {@@ -85,23 +82,11 @@ impl ModelCatalogState {catalog.push_str(&escaped);catalog.push('\n');}- Self {- catalog,- namespace: None,- }- }-- pub(crate) fn with_namespace(mut self, namespace: Option<ContentItemNamespace>) -> Self {- self.namespace = namespace;- self+ Self { catalog }}}impl ContextualUserFragment for ModelCatalogState {- fn content_metadata(&self) -> ContentItemMetadata {- ContentItemMetadata::tool(self.namespace.clone())- }-fn content_kind(&self) -> ContentItemKind {ContentItemKind("multi_agent.model_catalog".to_string())}diff --git a/codex-rs/core/src/context/world_state/multi_agent_mode.rs b/codex-rs/core/src/context/world_state/multi_agent_mode.rsindex 3ff875db45..4a575da4d3 100644--- a/codex-rs/core/src/context/world_state/multi_agent_mode.rs+++ b/codex-rs/core/src/context/world_state/multi_agent_mode.rs@@ -7,8 +7,6 @@ use super::multi_agent_usage_hint::MultiAgentUsageHintState;use crate::context::ContextualUserFragment;use crate::context::multi_agent_mode_instructions::MultiAgentModeInstructions;use codex_protocol::config_types::MultiAgentMode;-use codex_protocol::models::ContentItemMetadata;-use codex_protocol::models::ContentItemNamespace;use codex_utils_output_truncation::TruncationPolicy;use codex_utils_output_truncation::truncate_text;use serde::Deserialize;@@ -22,8 +20,6 @@ pub(crate) struct MultiAgentModeState {mode: Option<MultiAgentMode>,#[serde(default, skip_serializing_if = "Option::is_none")]usage_hint_hash: Option<WorldStateHash>,- #[serde(skip)]- namespace: Option<ContentItemNamespace>,}impl MultiAgentModeState {@@ -37,15 +33,9 @@ impl MultiAgentModeState {mode @ (MultiAgentMode::ExplicitRequestOnly | MultiAgentMode::Proactive) => mode,}),usage_hint_hash: None,- namespace: None,}}- pub(crate) fn with_namespace(mut self, namespace: ContentItemNamespace) -> Self {- self.namespace = Some(namespace);- self- }-pub(crate) fn with_usage_hint(mut self, usage_hint: &MultiAgentUsageHintState) -> Self {self.usage_hint_hash = Some(usage_hint.fingerprint.clone());self@@ -91,10 +81,8 @@ impl WorldStateSection for MultiAgentModeState {}};- let fragment = MultiAgentModeInstructions::from_mode(mode).map(|instructions| {- Box::new(instructions.with_metadata(ContentItemMetadata::tool(self.namespace.clone())))- as Box<dyn ContextualUserFragment>- });+ let fragment = MultiAgentModeInstructions::from_mode(mode)+ .map(|instructions| Box::new(instructions) as Box<dyn ContextualUserFragment>);(Some(self.clone()),WorldStateUpdate::optional_boxed_fragment(fragment),diff --git a/codex-rs/core/src/context/world_state/multi_agent_mode_tests.rs b/codex-rs/core/src/context/world_state/multi_agent_mode_tests.rsindex 4897929f16..041b765459 100644--- a/codex-rs/core/src/context/world_state/multi_agent_mode_tests.rs+++ b/codex-rs/core/src/context/world_state/multi_agent_mode_tests.rs@@ -136,12 +136,8 @@ fn catalog_role_updates_remain_separate_from_active_mode() {assert_eq!(updates,vec![- ContextualUserFragment::into(current_role.with_metadata(- codex_protocol::models::ContentItemMetadata::tool(/*namespace*/ None)- )),- ContextualUserFragment::into(expected_mode.with_metadata(- codex_protocol::models::ContentItemMetadata::tool(/*namespace*/ None)- )),+ ContextualUserFragment::into(current_role),+ ContextualUserFragment::into(expected_mode),],);}diff --git a/codex-rs/core/src/context/world_state/multi_agent_usage_hint.rs b/codex-rs/core/src/context/world_state/multi_agent_usage_hint.rsindex 77d65dc277..42892220ca 100644--- a/codex-rs/core/src/context/world_state/multi_agent_usage_hint.rs+++ b/codex-rs/core/src/context/world_state/multi_agent_usage_hint.rs@@ -6,15 +6,12 @@ use super::WorldStateUpdate;use crate::context::ContextualUserFragment;use crate::context::MultiAgentRoleInstructions;use crate::context::MultiAgentUsageHint;-use codex_protocol::models::ContentItemMetadata;-use codex_protocol::models::ContentItemNamespace;/// Configured or model-owned multi-agent instructions currently visible to the model.#[derive(Clone, Debug)]pub(crate) struct MultiAgentUsageHintState {instructions: MultiAgentRoleInstructions,pub(super) fingerprint: WorldStateHash,- namespace: Option<ContentItemNamespace>,}impl MultiAgentUsageHintState {@@ -23,14 +20,8 @@ impl MultiAgentUsageHintState {Self {instructions,fingerprint,- namespace: None,}}-- pub(crate) fn with_namespace(mut self, namespace: ContentItemNamespace) -> Self {- self.namespace = Some(namespace);- self- }}impl WorldStateSection for MultiAgentUsageHintState {@@ -52,14 +43,11 @@ impl WorldStateSection for MultiAgentUsageHintState {PreviousSectionState::Unknown => None,PreviousSectionState::Known(_) | PreviousSectionState::Absent => {if self.instructions.markers().0.is_empty() {- Some(Box::new(- MultiAgentUsageHint::new(&self.instructions.body())- .with_metadata(ContentItemMetadata::tool(self.namespace.clone())),- ))- } else {- Some(Box::new(self.instructions.clone().with_metadata(- ContentItemMetadata::tool(self.namespace.clone()),+ Some(Box::new(MultiAgentUsageHint::new(+ &self.instructions.body(),)))+ } else {+ Some(Box::new(self.instructions.clone()))}}};diff --git a/codex-rs/core/src/context/world_state/snapshots/codex_core__context__world_state__top_level_tools__tests__snapshots_namespace_transitions.snap b/codex-rs/core/src/context/world_state/snapshots/codex_core__context__world_state__top_level_tools__tests__snapshots_namespace_transitions.snapindex b3a5073648..413a35bb53 100644--- a/codex-rs/core/src/context/world_state/snapshots/codex_core__context__world_state__top_level_tools__tests__snapshots_namespace_transitions.snap+++ b/codex-rs/core/src/context/world_state/snapshots/codex_core__context__world_state__top_level_tools__tests__snapshots_namespace_transitions.snap@@ -74,14 +74,6 @@ None"internal_chat_message_metadata_passthrough": {"content_item_kinds": ["tools.incremental_update"- ],- "content_item_metadata": [- {- "provenance": {- "hook": false,- "type": "harness"- }- }]},"role": "developer",@@ -142,14 +134,6 @@ The following namespaces are no longer available. Do not call tools in them unle"internal_chat_message_metadata_passthrough": {"content_item_kinds": ["tools.incremental_update"- ],- "content_item_metadata": [- {- "provenance": {- "hook": false,- "type": "harness"- }- }]},"role": "developer",@@ -224,14 +208,6 @@ None"internal_chat_message_metadata_passthrough": {"content_item_kinds": ["tools.incremental_update"- ],- "content_item_metadata": [- {- "provenance": {- "hook": false,- "type": "harness"- }- }]},"role": "developer",diff --git a/codex-rs/core/src/context/world_state/tools.rs b/codex-rs/core/src/context/world_state/tools.rsindex de2757e07d..74582ab77d 100644--- a/codex-rs/core/src/context/world_state/tools.rs+++ b/codex-rs/core/src/context/world_state/tools.rs@@ -8,15 +8,12 @@ use super::SectionTransition;use super::WorldStateContextFragment;use super::WorldStateSection;use super::WorldStateUpdate;-use crate::context::ContextualUserFragment;use codex_extension_api::ExtensionMetrics;use codex_extension_api::RenderedWorldStateFragment;use codex_otel::THREAD_TOOLS_FRAGMENT_BYTES_METRIC;use codex_otel::THREAD_TOOLS_METRIC_BUCKETS;use codex_otel::THREAD_TOOLS_NAMESPACES_TOTAL_METRIC;use codex_protocol::models::ContentItemKind;-use codex_protocol::models::ContentItemMetadata;-use codex_protocol::models::ContentItemNamespace;use codex_protocol::protocol::TOOLS_CLOSE_TAG;use codex_protocol::protocol::TOOLS_OPEN_TAG;use std::collections::BTreeMap;@@ -141,19 +138,14 @@ impl WorldStateSection for ToolsState {record_fragment_metrics(self.metrics.as_ref(), previous, &rendered);(Some(current),- vec![WorldStateUpdate::fragment(- WorldStateContextFragment {- fragment: RenderedWorldStateFragment::new(- "developer",- (TOOLS_OPEN_TAG, TOOLS_CLOSE_TAG),- rendered.body,- ),- content_kind: ContentItemKind("tools.deferred_namespaces".to_string()),- }- .with_metadata(ContentItemMetadata::tool(Some(- ContentItemNamespace::ToolSearch,- ))),- )],+ vec![WorldStateUpdate::fragment(WorldStateContextFragment {+ fragment: RenderedWorldStateFragment::new(+ "developer",+ (TOOLS_OPEN_TAG, TOOLS_CLOSE_TAG),+ rendered.body,+ ),+ content_kind: ContentItemKind("tools.deferred_namespaces".to_string()),+ })],)}}diff --git a/codex-rs/core/src/context/world_state/top_level_tools.rs b/codex-rs/core/src/context/world_state/top_level_tools.rsindex d26f05d5be..1a4f7005a7 100644--- a/codex-rs/core/src/context/world_state/top_level_tools.rs+++ b/codex-rs/core/src/context/world_state/top_level_tools.rs@@ -16,7 +16,6 @@ use codex_otel::TOOL_INCREMENTAL_UPDATES_METRIC;use codex_protocol::error::CodexErrorDetails;use codex_protocol::error::Result;use codex_protocol::models::ContentItemKind;-use codex_protocol::models::ContentItemMetadata;use codex_protocol::models::ResponseItem;use serde_json::Value;use std::collections::BTreeMap;@@ -179,10 +178,8 @@ impl WorldStateSection for TopLevelToolsState {} else {format!("Updated instructions for the {name} namespace:\n{instructions}")};- namespace_updates.push(WorldStateUpdate::fragment(- DeveloperInstructions::new(text)- .with_metadata(ContentItemMetadata::tool(Some(name.to_string().into()))),- ));+ namespace_updates+ .push(WorldStateUpdate::fragment(DeveloperInstructions::new(text)));}}let mut updates = Vec::new();diff --git a/codex-rs/core/src/context/world_state/top_level_tools_tests.rs b/codex-rs/core/src/context/world_state/top_level_tools_tests.rsindex 23639166b4..a75fd6e44b 100644--- a/codex-rs/core/src/context/world_state/top_level_tools_tests.rs+++ b/codex-rs/core/src/context/world_state/top_level_tools_tests.rs@@ -342,14 +342,9 @@ fn namespace_description_change_does_not_repeat_unchanged_tools() {let (snapshot, updates) = current.render_diff(PreviousSectionState::Known(&snapshot));assert_eq!(merge_world_state_updates(updates),- vec![ContextualUserFragment::into(- DeveloperInstructions::new(- "Updated instructions for the functions namespace:\nUpdated namespace guidance."- )- .with_metadata(codex_protocol::models::ContentItemMetadata::tool(Some(- codex_protocol::models::ContentItemNamespace::Functions- )))- )]+ vec![ContextualUserFragment::into(DeveloperInstructions::new(+ "Updated instructions for the functions namespace:\nUpdated namespace guidance."+ ))]);assert!(currentdiff --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 aef284e161..a5ceddc775 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@@ -192,14 +192,11 @@ fn extension_owned_section_uses_its_stable_id_as_content_kind_feature() {world_state.add_extension_section(WorldStateSectionContribution::new("extension_test", |_| {(Some(json!({"value": "after"})),- Some(- RenderedWorldStateFragment::new(- "developer",- ("<extension_test>", "</extension_test>"),- "after",- )- .with_metadata(codex_protocol::models::ContentItemMetadata::skills()),- ),+ Some(RenderedWorldStateFragment::new(+ "developer",+ ("<extension_test>", "</extension_test>"),+ "after",+ )),)}));@@ -214,10 +211,9 @@ fn extension_owned_section_uses_its_stable_id_as_content_kind_feature() {.collect::<Vec<_>>(),vec![("developer",- AnnotatedContent::text(+ AnnotatedContent::input_text("<extension_test>after</extension_test>",ContentItemKind("extension_test.instructions".to_string()),- codex_protocol::models::ContentItemMetadata::skills(),),)]);diff --git a/codex-rs/core/src/context_manager/history_tests.rs b/codex-rs/core/src/context_manager/history_tests.rsindex a999fbe5d9..c5551b6320 100644--- a/codex-rs/core/src/context_manager/history_tests.rs+++ b/codex-rs/core/src/context_manager/history_tests.rs@@ -46,8 +46,6 @@ use image::Luma;use image::Rgba;use pretty_assertions::assert_eq;use regex_lite::Regex;-use serde_json::from_value;-use serde_json::json;use test_case::test_case;const EXEC_FORMAT_MAX_BYTES: usize = 10_000;@@ -1266,10 +1264,6 @@ fn for_prompt_strips_media_when_model_does_not_support_it() {ContentItemKind("audio.unsupported".to_string()),ContentItemKind("user.text".to_string()),]),- content_item_metadata: from_value(json!([- {}, {"harness_injected": true}, {"harness_injected": true}, {}- ]))- .unwrap(),..Default::default()},),diff --git a/codex-rs/core/src/context_manager/updates.rs b/codex-rs/core/src/context_manager/updates.rsindex fa3ded9147..576d546849 100644--- a/codex-rs/core/src/context_manager/updates.rs+++ b/codex-rs/core/src/context_manager/updates.rs@@ -4,18 +4,27 @@ use crate::context::world_state::Placement;use crate::context::world_state::WorldStateUpdate;use crate::context::world_state::WorldStateUpdateContent;use codex_context_fragments::RenderedFragment;-use codex_context_fragments::message_from_parts;+use codex_protocol::models::InternalChatMessageMetadataPassthrough;use codex_protocol::models::ResponseItem;pub(crate) fn build_rendered_message(fragments: Vec<RenderedFragment>) -> Option<ResponseItem> {let role = fragments.first()?.role();debug_assert!(fragments.iter().all(|fragment| fragment.role() == role));- let content = fragments+ let (content, content_item_kinds): (Vec<_>, Vec<_>) = fragments.into_iter()- .map(|fragment| fragment.into_parts().1)- .collect();+ .map(|fragment| fragment.into_parts().1.into_parts())+ .unzip();- Some(message_from_parts(role, content))+ Some(ResponseItem::Message {+ id: None,+ role: role.to_string(),+ content,+ phase: None,+ internal_chat_message_metadata_passthrough: Some(InternalChatMessageMetadataPassthrough {+ content_item_kinds: Some(content_item_kinds),+ ..Default::default()+ }),+ })}pub(crate) fn merge_world_state_updates(updates: Vec<WorldStateUpdate>) -> Vec<ResponseItem> {diff --git a/codex-rs/core/src/context_manager/updates_tests.rs b/codex-rs/core/src/context_manager/updates_tests.rsindex 94c249fee1..026058bbdf 100644--- a/codex-rs/core/src/context_manager/updates_tests.rs+++ b/codex-rs/core/src/context_manager/updates_tests.rs@@ -4,7 +4,6 @@ use super::*;use crate::context::ContextualUserFragment;use codex_protocol::models::ContentItem;use codex_protocol::models::ContentItemKind;-use codex_protocol::models::InternalChatMessageMetadataPassthrough;use pretty_assertions::assert_eq;use serde_json::json;@@ -45,7 +44,6 @@ fn fragment(role: &'static str, text: &'static str) -> TestFragment {}fn message(role: &str, texts: &[&str]) -> ResponseItem {- let provenance = serde_json::from_value(json!({"harness_injected": true})).unwrap();ResponseItem::Message {id: None,role: role.to_string(),@@ -57,7 +55,6 @@ fn message(role: &str, texts: &[&str]) -> ResponseItem {.collect(),phase: None,internal_chat_message_metadata_passthrough: Some(InternalChatMessageMetadataPassthrough {- content_item_metadata: Some(vec![provenance; texts.len()]),content_item_kinds: Some(texts.iter()diff --git a/codex-rs/core/src/event_mapping_tests.rs b/codex-rs/core/src/event_mapping_tests.rsindex e60e1e9ddd..d6d9f59f2c 100644--- a/codex-rs/core/src/event_mapping_tests.rs+++ b/codex-rs/core/src/event_mapping_tests.rs@@ -429,7 +429,6 @@ fn parses_hook_prompt_message_as_distinct_turn_item() {HookPromptFragment {text: "Retry with exactly the phrase meow meow meow.".to_string(),hook_run_id: "hook-run-1".to_string(),- metadata: Default::default(),});}@@ -465,7 +464,6 @@ fn parses_hook_prompt_and_hides_other_contextual_fragments() {vec![HookPromptFragment {text: "Retry with care & joy.".to_string(),hook_run_id: "hook-run-1".to_string(),- metadata: Default::default(),}]);}diff --git a/codex-rs/core/src/hook_mcp_executor.rs b/codex-rs/core/src/hook_mcp_executor.rsindex 279da61394..7fa0b78d42 100644--- a/codex-rs/core/src/hook_mcp_executor.rs+++ b/codex-rs/core/src/hook_mcp_executor.rs@@ -3,7 +3,6 @@ use std::sync::Arc;use anyhow::bail;use codex_hooks::HookMcpCall;use codex_hooks::HookMcpExecutor;-use codex_hooks::HookMcpOutput;use codex_mcp::McpRuntime;use codex_protocol::ThreadId;use futures::FutureExt;@@ -17,7 +16,7 @@ pub(crate) struct CoreHookMcpExecutor {}impl HookMcpExecutor for CoreHookMcpExecutor {- fn execute(&self, call: HookMcpCall) -> BoxFuture<'_, anyhow::Result<HookMcpOutput>> {+ fn execute(&self, call: HookMcpCall) -> BoxFuture<'_, anyhow::Result<String>> {async move {let mut metadata = call.metadata.unwrap_or_default();metadata.insert(@@ -25,7 +24,7 @@ impl HookMcpExecutor for CoreHookMcpExecutor {Value::String(self.thread_id.to_string()),);- let call_result = self+ let result = self.runtime.latest_call_tool(&call.server,@@ -37,7 +36,6 @@ impl HookMcpExecutor for CoreHookMcpExecutor {/*wait_for_server*/ false,).await?;- let result = call_result.result;let text = result.content.iter()@@ -52,10 +50,7 @@ impl HookMcpExecutor for CoreHookMcpExecutor {bail!("MCP tool returned an error: {text}");}- Ok(HookMcpOutput {- text,- source_tool_namespace: call_result.source_tool_namespace,- })+ Ok(text)}.boxed()}diff --git a/codex-rs/core/src/hook_runtime.rs b/codex-rs/core/src/hook_runtime.rsindex 4cbb06f81f..1eb54fa25b 100644--- a/codex-rs/core/src/hook_runtime.rs+++ b/codex-rs/core/src/hook_runtime.rs@@ -75,7 +75,7 @@ use crate::turn_metadata::ExecutionMetadata;pub(crate) struct HookRuntimeOutcome {pub should_stop: bool,- pub additional_contexts: Vec<codex_hooks::HookContext>,+ pub additional_contexts: Vec<String>,}pub(crate) enum PreToolUseHookResult {@@ -718,7 +718,7 @@ pub(crate) async fn record_pending_input(turn_context: &Arc<TurnContext>,model_info: &ModelInfo,pending_input: TurnInput,- additional_contexts: Vec<codex_hooks::HookContext>,+ additional_contexts: Vec<String>,persist_context: PersistContext,) {match pending_input {@@ -790,10 +790,7 @@ pub(crate) async fn drain_async_hook_results(.entries.iter().filter(|entry| entry.kind == HookOutputEntryKind::Context)- .map(|entry| codex_hooks::HookContext {- text: entry.text.clone(),- metadata: codex_protocol::models::ContentItemMetadata::command_hook(),- })+ .map(|entry| entry.text.clone()).collect::<Vec<_>>();if before_user_prompt {@@ -852,7 +849,7 @@ impl HookRuntimeOutcome {pub(crate) async fn record_additional_contexts(sess: &Arc<Session>,turn_context: &Arc<TurnContext>,- additional_contexts: Vec<codex_hooks::HookContext>,+ additional_contexts: Vec<String>,) {let developer_messages = additional_context_messages(additional_contexts);if developer_messages.is_empty() {@@ -867,9 +864,7 @@ pub(crate) async fn record_additional_contexts(.await;}-fn additional_context_messages(- additional_contexts: Vec<codex_hooks::HookContext>,-) -> Vec<ResponseItem> {+fn additional_context_messages(additional_contexts: Vec<String>) -> Vec<ResponseItem> {additional_contexts.into_iter().map(HookAdditionalContext::new)@@ -1109,8 +1104,8 @@ mod tests {#[test]fn additional_context_messages_stay_separate_and_ordered() {let messages = additional_context_messages(vec![- codex_hooks::HookContext::harness("first tide note".to_string()),- codex_hooks::HookContext::harness("second tide note".to_string()),+ "first tide note".to_string(),+ "second tide note".to_string(),]);assert_eq!(messages.len(), 2);diff --git a/codex-rs/core/src/image_preparation.rs b/codex-rs/core/src/image_preparation.rsindex ae7e97f9db..e3be1a0612 100644--- a/codex-rs/core/src/image_preparation.rs+++ b/codex-rs/core/src/image_preparation.rs@@ -283,10 +283,9 @@ async fn prepare_message_content(Ok(_) => {}Err(error) => {warn!(%error, "failed to prepare message image");- *item = AnnotatedContent::text(+ *item = AnnotatedContent::input_text(error.placeholder(),ContentItemKind("images.preparation_error".to_string()),- codex_protocol::models::ContentItemMetadata::harness(),);}}diff --git a/codex-rs/core/src/image_preparation_tests.rs b/codex-rs/core/src/image_preparation_tests.rsindex d399b282b6..3bee21f152 100644--- a/codex-rs/core/src/image_preparation_tests.rs+++ b/codex-rs/core/src/image_preparation_tests.rs@@ -20,8 +20,6 @@ use image::ImageBuffer;use image::ImageFormat;use image::Rgba;use pretty_assertions::assert_eq;-use serde_json::from_value;-use serde_json::json;use super::*;@@ -140,7 +138,6 @@ async fn preparation_preserves_small_image_bytes_and_replaces_remote_urls() {content_item_kinds: Some(vec![ContentItemKind("images.preparation_error".to_string())]),- content_item_metadata: from_value(json!([{"harness_injected": true}])).unwrap(),..Default::default()}),@@ -416,8 +413,6 @@ async fn resize_notices_count_file_backed_images_and_skip_failed_images() {ContentItemKind("images.preparation_error".to_string()),ContentItemKind("user.image".to_string()),]),- content_item_metadata: from_value(json!([{}, {}, {"harness_injected": true}, {}]))- .unwrap(),..Default::default()}),);@@ -472,7 +467,6 @@ async fn resize_notices_count_file_backed_images_and_skip_failed_images() {content_item_kinds: Some(vec![ContentItemKind("images.resize_notice".to_string())]),- content_item_metadata: from_value(json!([{"harness_injected": true}])).unwrap(),..Default::default()},),@@ -526,7 +520,6 @@ async fn resize_notices_count_file_backed_images_and_skip_failed_images() {content_item_kinds: Some(vec![ContentItemKind("images.resize_notice".to_string())]),- content_item_metadata: from_value(json!([{"harness_injected": true}])).unwrap(),..Default::default()},),diff --git a/codex-rs/core/src/session/mod.rs b/codex-rs/core/src/session/mod.rsindex c30252eee8..cfc78caabb 100644--- a/codex-rs/core/src/session/mod.rs+++ b/codex-rs/core/src/session/mod.rs@@ -131,8 +131,6 @@ use codex_protocol::models::BaseInstructions;use codex_protocol::models::BaseInstructionsProvenance;use codex_protocol::models::ContentItem;use codex_protocol::models::ContentItemKind;-use codex_protocol::models::ContentItemMetadata;-use codex_protocol::models::ContentItemNamespace;use codex_protocol::models::ImageReference;use codex_protocol::models::InternalChatMessageMetadataPassthrough;use codex_protocol::models::PermissionProfile;@@ -3563,7 +3561,6 @@ impl Session {*internal_chat_message_metadata_passthrough =Some(InternalChatMessageMetadataPassthrough {content_item_kinds: Some(content_item_kinds),- content_item_metadata: Some(vec![ContentItemMetadata::user(); content.len()]),..Default::default()});}@@ -4001,31 +3998,7 @@ impl Session {model_info: &ModelInfo,communication: InterAgentCommunication,) {- let mut response_item = communication.to_model_input_item();- if let ResponseItem::AgentMessage {- content,- internal_chat_message_metadata_passthrough,- ..- } = &mut response_item- {- internal_chat_message_metadata_passthrough- .get_or_insert_default()- .content_item_metadata- .get_or_insert_with(|| {- vec![- ContentItemMetadata::tool(Some(- turn_context- .config- .multi_agent_v2- .tool_namespace- .clone()- .map(ContentItemNamespace::from)- .unwrap_or(ContentItemNamespace::Functions),- ));- content.len()- ]- });- }+ let response_item = communication.to_model_input_item();let (items, _) = self.prepare_conversation_items_for_history(turn_context,@@ -4351,7 +4324,7 @@ impl Session {let turn_context = step_context.turn.as_ref();let mut developer_sections = Vec::<RenderedFragment>::with_capacity(8);let mut contextual_user_sections = Vec::<RenderedFragment>::with_capacity(2);- let mut separate_developer_messages = Vec::<ResponseItem>::new();+ let mut separate_developer_sections = Vec::<RenderedFragment>::new();let mut context_window_hints = Vec::new();let (session_source, auto_compact_window_ids) = {let state = self.state.lock().await;@@ -4408,7 +4381,7 @@ impl Session {{match fragment.slot() {PromptSlot::ContextWindow => {- context_window_hints.push(fragment.into_content());+ context_window_hints.push(fragment.text().to_string());}PromptSlot::DeveloperPolicy | PromptSlot::DeveloperCapabilities => {developer_sections.push(fragment.into());@@ -4446,7 +4419,7 @@ impl Session {.token_budget.as_ref().is_some_and(|config| config.use_history_notes_extension)- && let Some((text, source_tool_namespace)) = self+ && let Some(mcp_result) = self.services.mcp_runtime.latest_call_tool(@@ -4462,9 +4435,8 @@ impl Session {).await.ok()- .and_then(|call| {- let text = call- .result+ .and_then(|result| {+ let text = result.content.iter().filter_map(|content| {@@ -4473,16 +4445,12 @@ impl Session {.filter(|text| !text.is_empty()).collect::<Vec<_>>().join("\n");- (!text.is_empty()).then_some((text, call.source_tool_namespace))+ (!text.is_empty()).then_some(text)}){- context_window_hints.push(codex_context_fragments::AnnotatedContent::text(- text,- ContentItemKind("notes.thread_hint".to_string()),- ContentItemMetadata::tool(source_tool_namespace.map(Into::into)),- ));+ context_window_hints.push(mcp_result);}- separate_developer_messages.push(+ separate_developer_sections.push(crate::context::TokenBudgetContext::new(session_source.get_agent_path()@@ -4490,8 +4458,9 @@ impl Session {auto_compact_window_ids.first_window_id,auto_compact_window_ids.previous_window_id,auto_compact_window_ids.window_id,+ (!context_window_hints.is_empty()).then(|| context_window_hints.join("\n")),)- .render_with_hints(context_window_hints),+ .render_fragment(),);}let (snapshot, updates) = world_state.render_full();@@ -4531,13 +4500,13 @@ impl Session {"developer"if fragment.markers().0 == MultiAgentRoleInstructions::type_markers().0 =>{- separate_developer_messages.push(fragment.render_fragment().into());+ separate_developer_sections.push(fragment.render_fragment());}"developer"if update.placement == Placement::Standalone&& fragment.markers().0.is_empty() =>{- separate_developer_messages.push(fragment.render_fragment().into());+ separate_developer_sections.push(fragment.render_fragment());}"developer" => developer_sections.push(fragment.render_fragment()),"user" => contextual_user_sections.push(fragment.render_fragment()),@@ -4558,7 +4527,13 @@ impl Session {) {items.push(developer_message);}- items.append(&mut separate_developer_messages);+ for section in separate_developer_sections.drain(..) {+ if let Some(developer_message) =+ crate::context_manager::updates::build_rendered_message(vec![section])+ {+ items.push(developer_message);+ }+ }if let Some(initial_multi_agent_mode) = initial_multi_agent_mode&& let Some(message) =crate::context_manager::updates::build_rendered_message(vec![diff --git a/codex-rs/core/src/session/tests.rs b/codex-rs/core/src/session/tests.rsindex db3b4efc85..dc0bebebc6 100644--- a/codex-rs/core/src/session/tests.rs+++ b/codex-rs/core/src/session/tests.rs@@ -161,7 +161,6 @@ use codex_protocol::mcp::McpAttributionStatus;use codex_protocol::models::BaseInstructions;use codex_protocol::models::ContentItem;use codex_protocol::models::ContentItemKind;-use codex_protocol::models::ContentItemMetadata;use codex_protocol::models::InternalChatMessageMetadataPassthrough;use codex_protocol::models::ResponseItem;use codex_protocol::protocol::AskForApproval;@@ -2770,11 +2769,6 @@ async fn record_inter_agent_communication_sets_turn_id_in_rollout_and_resume() {/*trigger_turn*/ false,);let mut expected_item = communication.to_model_input_item();- let mut expected = serde_json::to_value(&expected_item).unwrap();- expected["internal_chat_message_metadata_passthrough"] = json!({- "content_item_metadata": [{"harness_injected": true, "source_tool_namespace": "collaboration"}],- });- expected_item = serde_json::from_value(expected).unwrap();expected_item.set_turn_id_if_missing(&turn_context.sub_id);session@@ -3162,11 +3156,6 @@ async fn prepares_resumed_history_before_installing_it() {ContentItemKind("images.preparation_error".to_string()),ContentItemKind("unknown".to_string()),]),- content_item_metadata: Some(vec![- ContentItemMetadata::harness(),- ContentItemMetadata::harness(),- ContentItemMetadata::default(),- ]),..Default::default()},),@@ -4135,9 +4124,6 @@ async fn record_initial_history_assigns_and_persists_id_for_forked_response_itemcontent_item_kinds: Some(vec![ContentItemKind("generic.developer_instructions".to_string(),)]),- content_item_metadata: Some(vec![ContentItemMetadata::developer_instructions(- /*from_additional_requirements*/ false,- )]),..Default::default()}),};diff --git a/codex-rs/core/src/session/world_state.rs b/codex-rs/core/src/session/world_state.rsindex a23dea125c..a556d20a4c 100644--- a/codex-rs/core/src/session/world_state.rs+++ b/codex-rs/core/src/session/world_state.rs@@ -34,7 +34,6 @@ use codex_prompts::ResolvedModelMessages;use codex_prompts::render_model_instructions;use codex_protocol::error::Result as CodexResult;use codex_protocol::models::BaseInstructionsProvenance;-use codex_protocol::models::ContentItemNamespace;use codex_protocol::protocol::MultiAgentVersion;use codex_tools::ToolName;@@ -174,6 +173,7 @@ impl Session {window_ids.first_window_id,window_ids.previous_window_id,window_ids.window_id,+ /*thread_hint*/ None,));}let guidance = step_context@@ -354,20 +354,11 @@ impl Session {world_state.add_extension_section(section);}}- let v2_namespace = turn_context- .config- .multi_agent_v2- .tool_namespace- .clone()- .map(ContentItemNamespace::from)- .unwrap_or(ContentItemNamespace::Functions);let mut multi_agent_mode = MultiAgentModeState::new(super::multi_agents::effective_multi_agent_mode(step_context),- )- .with_namespace(v2_namespace.clone());+ );if let Some(usage_hint_text) = super::multi_agents::usage_hint_text(step_context) {- let usage_hint =- MultiAgentUsageHintState::new(usage_hint_text).with_namespace(v2_namespace.clone());+ let usage_hint = MultiAgentUsageHintState::new(usage_hint_text);multi_agent_mode = multi_agent_mode.with_usage_hint(&usage_hint);world_state.add_section(usage_hint);}@@ -404,12 +395,7 @@ impl Session {)} else {ModelCatalogState::default()- }- .with_namespace(match turn_context.multi_agent_version {- MultiAgentVersion::Disabled => None,- MultiAgentVersion::V1 => Some(ContentItemNamespace::MultiAgentV1),- MultiAgentVersion::V2 => Some(v2_namespace),- }),+ },);if !crate::guardian::is_basic_session_source(&turn_context.session_source) {world_state.add_section(ManagedDeveloperInstructionsState::new(diff --git a/codex-rs/core/src/thread_manager_tests.rs b/codex-rs/core/src/thread_manager_tests.rsindex fc51155e80..b587d03a99 100644--- a/codex-rs/core/src/thread_manager_tests.rs+++ b/codex-rs/core/src/thread_manager_tests.rs@@ -28,7 +28,6 @@ use codex_protocol::mcp::MCP_APP_UI_EXTENSION_ID;use codex_protocol::mcp::OPENAI_FORM_EXTENSION_ID;use codex_protocol::models::ContentItem;use codex_protocol::models::ContentItemKind;-use codex_protocol::models::ContentItemMetadata;use codex_protocol::models::InternalChatMessageMetadataPassthrough;use codex_protocol::models::ReasoningItemReasoningSummary;use codex_protocol::models::ResponseItem;@@ -3075,7 +3074,6 @@ fn multi_agent_v2_interrupted_marker_uses_developer_input_message() {content_item_kinds: Some(vec![ContentItemKind("generic.turn_aborted".to_string())]),- content_item_metadata: Some(vec![ContentItemMetadata::harness()]),..Default::default()}),diff --git a/codex-rs/core/tests/suite/compact.rs b/codex-rs/core/tests/suite/compact.rsindex 6b025e6108..b46bc107e9 100644--- a/codex-rs/core/tests/suite/compact.rs+++ b/codex-rs/core/tests/suite/compact.rs@@ -5787,7 +5787,6 @@ async fn remote_v2_compaction_refreshes_instructions_and_preserves_them_on_cold_)?;let mut builder = test_codex().with_home(Arc::clone(&home))- .with_model_info_override("gpt-5.5", |model| model.use_responses_lite = true).with_auth(CodexAuth::create_dummy_chatgpt_auth_for_testing());let test = builder.build(&server).await?;@@ -5847,7 +5846,6 @@ async fn remote_v2_compaction_refreshes_instructions_and_preserves_them_on_cold_let resumed_cwd = test.config.cwd.clone();let mut resume_builder = test_codex().with_home(Arc::clone(&home))- .with_model_info_override("gpt-5.5", |model| model.use_responses_lite = true).with_auth(CodexAuth::create_dummy_chatgpt_auth_for_testing()).with_config(move |config| config.cwd = resumed_cwd);let resumed = resume_builder@@ -5863,7 +5861,7 @@ async fn remote_v2_compaction_refreshes_instructions_and_preserves_them_on_cold_assert_single_instruction_fragment(&requests[3], &new_fragment);let resumed_input = requests[3].input();assert_eq!(- resumed_input.get(2..=replacement_history.len() + 1),+ resumed_input.get(1..=replacement_history.len()),Some(replacement_history.as_slice()),"remote-v2 cold resume should replay persisted replacement history verbatim");diff --git a/codex-rs/core/tests/suite/mcp_auth_refresh.rs b/codex-rs/core/tests/suite/mcp_auth_refresh.rsindex 03d42e2707..67bfe7f09b 100644--- a/codex-rs/core/tests/suite/mcp_auth_refresh.rs+++ b/codex-rs/core/tests/suite/mcp_auth_refresh.rs@@ -143,7 +143,7 @@ async fn hosted_plugin_runtime_ps_mcp_tool_calls_use_current_auth_manager_token(/*wait_for_server*/ true,).await?;- assert_eq!(tool_result.result.is_error, Some(false));+ assert_eq!(tool_result.is_error, Some(false));let requests = server.received_requests()diff --git a/codex-rs/core/tests/suite/responses_lite.rs b/codex-rs/core/tests/suite/responses_lite.rsindex dde83441f3..d109c4154c 100644--- a/codex-rs/core/tests/suite/responses_lite.rs+++ b/codex-rs/core/tests/suite/responses_lite.rs@@ -133,23 +133,21 @@ async fn base_instructions_use_input_items(responses_lite: bool) -> Result<()> {.as_str().is_some_and(|id| id.starts_with("msg_")));- let mut expected_instructions = serde_json::json!({- "id": instructions["id"],- "type": "message",- "role": "developer",- "content": [{- "type": "input_text",- "text": "test instructions",- }],- "internal_chat_message_metadata_passthrough": {- "content_item_kinds": ["model.base_instructions"],- },- });- if responses_lite {- expected_instructions["internal_chat_message_metadata_passthrough"]["content_item_metadata"] =- serde_json::json!([{"provenance": {"type": "harness", "hook": false}}]);- }- assert_eq!(instructions, &expected_instructions);+ assert_eq!(+ instructions,+ &serde_json::json!({+ "id": instructions["id"],+ "type": "message",+ "role": "developer",+ "content": [{+ "type": "input_text",+ "text": "test instructions",+ }],+ "internal_chat_message_metadata_passthrough": {+ "content_item_kinds": ["model.base_instructions"],+ },+ })+ );let tools = if responses_lite {assert!(body.get("tools").is_none());diff --git a/codex-rs/core/tests/suite/token_budget.rs b/codex-rs/core/tests/suite/token_budget.rsindex 23fae98781..a0b23a1db7 100644--- a/codex-rs/core/tests/suite/token_budget.rs+++ b/codex-rs/core/tests/suite/token_budget.rs@@ -76,9 +76,8 @@ fn model_token_budget_config() -> ModelTokenBudgetConfig {fn token_budget_contexts(request: &ResponsesRequest) -> Vec<String> {let context_window_prefix = format!("{CONTEXT_WINDOW_OPEN_TAG}\n");request- .message_input_text_groups("developer")+ .message_input_texts("developer").into_iter()- .map(|parts| parts.concat()).filter(|text| text.starts_with(&context_window_prefix)).collect()}diff --git a/codex-rs/ext/extension-api/src/contributors/prompt.rs b/codex-rs/ext/extension-api/src/contributors/prompt.rsindex e2dd3ae438..73a12e3a6a 100644--- a/codex-rs/ext/extension-api/src/contributors/prompt.rs+++ b/codex-rs/ext/extension-api/src/contributors/prompt.rs@@ -1,10 +1,8 @@-//! Extension prompt placement with content and producer attribution kept together.+// All this file should be replaced by the existing fragment implementation ofcuse codex_context_fragments::AnnotatedContent;use codex_context_fragments::RenderedFragment;-use codex_protocol::models::ContentItem;use codex_protocol::models::ContentItemKind;-use codex_protocol::models::ContentItemMetadata;#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]pub enum PromptSlot {@@ -14,35 +12,20 @@ pub enum PromptSlot {ContextWindow,}-#[derive(Clone, Debug, PartialEq)]+#[derive(Clone, Debug, PartialEq, Eq)]pub struct PromptFragment {slot: PromptSlot,- content: AnnotatedContent,+ text: String,+ content_kind: ContentItemKind,}impl PromptFragment {- /// Creates harness-provided context for the given slot.+ /// Creates a prompt fragment for the given slot.pub fn new(slot: PromptSlot, text: impl Into<String>, content_kind: ContentItemKind) -> Self {Self {slot,- content: AnnotatedContent::text(text, content_kind, ContentItemMetadata::harness()),- }- }-- /// Creates tool-supplied context without changing its prompt placement.- pub fn tool(- slot: PromptSlot,- text: impl Into<String>,- content_kind: ContentItemKind,- namespace: String,- ) -> Self {- Self {- slot,- content: AnnotatedContent::text(- text,- content_kind,- ContentItemMetadata::tool(Some(namespace.into())),- ),+ text: text.into(),+ content_kind,}}@@ -63,25 +46,20 @@ impl PromptFragment {/// Returns the model-visible text.pub fn text(&self) -> &str {- let ContentItem::InputText { text } = self.content.content() else {- unreachable!("prompt fragments contain text");- };- text+ &self.text}/// Returns the producer-owned classification of the model-visible text.pub fn content_kind(&self) -> &ContentItemKind {- self.content.kind()- }-- /// Consumes the placement wrapper when assembling a shared context message.- pub fn into_content(self) -> AnnotatedContent {- self.content+ &self.content_kind}}impl From<PromptFragment> for RenderedFragment {fn from(fragment: PromptFragment) -> Self {- Self::new("developer", fragment.content)+ Self::new(+ "developer",+ AnnotatedContent::input_text(fragment.text, fragment.content_kind),+ )}}diff --git a/codex-rs/ext/extension-api/src/contributors/world_state.rs b/codex-rs/ext/extension-api/src/contributors/world_state.rsindex 5c51a82025..f5571bb8d8 100644--- a/codex-rs/ext/extension-api/src/contributors/world_state.rs+++ b/codex-rs/ext/extension-api/src/contributors/world_state.rs@@ -3,7 +3,6 @@ use std::sync::Arc;use codex_exec_server_protocol::ExecutorCapabilityDiscoverySnapshot;use codex_protocol::ThreadId;use codex_protocol::capabilities::SelectedCapabilityRoot;-use codex_protocol::models::ContentItemMetadata;use codex_protocol::openai_models::ModelInfo;use codex_protocol::protocol::TurnEnvironmentSelection;use serde_json::Value;@@ -48,7 +47,6 @@ pub struct RenderedWorldStateFragment {role: &'static str,markers: (&'static str, &'static str),body: String,- metadata: ContentItemMetadata,}impl RenderedWorldStateFragment {@@ -61,20 +59,9 @@ impl RenderedWorldStateFragment {role,markers,body: body.into(),- metadata: ContentItemMetadata::harness(),}}- /// Attach the producer's source before the harness assembles the context message.- pub fn with_metadata(mut self, metadata: ContentItemMetadata) -> Self {- self.metadata = metadata;- self- }-- pub fn metadata(&self) -> &ContentItemMetadata {- &self.metadata- }-pub fn role(&self) -> &'static str {self.role}diff --git a/codex-rs/ext/guardian-v2/src/async_scorer/config_tests.rs b/codex-rs/ext/guardian-v2/src/async_scorer/config_tests.rsindex 924312ff99..3f4cc73fb8 100644--- a/codex-rs/ext/guardian-v2/src/async_scorer/config_tests.rs+++ b/codex-rs/ext/guardian-v2/src/async_scorer/config_tests.rs@@ -17,7 +17,7 @@ fn rendered_classifier_text(config: &GuardianV2Config, policy: &str) -> String {let (_, content) = config.render_classifier_instructions(policy, "").into_parts();- let (ContentItem::InputText { text }, _, _) = content.into_parts() else {+ let (ContentItem::InputText { text }, _) = content.into_parts() else {panic!("classifier instructions must be text");};text@@ -53,7 +53,7 @@ fn extra_policy_reaches_templated_and_legacy_classifier_instructions() {let (_, content) = config.render_classifier_instructions(policy, extra_policy).into_parts();- let (ContentItem::InputText { text }, _, _) = content.into_parts() else {+ let (ContentItem::InputText { text }, _) = content.into_parts() else {panic!("classifier instructions must be text");};assert_eq!(diff --git a/codex-rs/ext/guardian-v2/src/async_scorer/decisions_tests.rs b/codex-rs/ext/guardian-v2/src/async_scorer/decisions_tests.rsindex 34db283403..57823748e9 100644--- a/codex-rs/ext/guardian-v2/src/async_scorer/decisions_tests.rs+++ b/codex-rs/ext/guardian-v2/src/async_scorer/decisions_tests.rs@@ -5,7 +5,6 @@ use codex_guardian_context::TrustedTool;use codex_guardian_context::TrustedToolSource;use codex_http_client::HttpClientBuilder;use codex_protocol::models::ContentItemKind;-use codex_protocol::models::ContentItemMetadata;use pretty_assertions::assert_eq;use wiremock::Mock;use wiremock::MockServer;@@ -19,11 +18,7 @@ use wiremock::matchers::path;fn adapter_rejects_unsupported_evidence() {let rubric = RenderedFragment::new("developer",- AnnotatedContent::text(- "Classify risk.",- ContentItemKind("guardian.test".into()),- ContentItemMetadata::harness(),- ),+ AnnotatedContent::input_text("Classify risk.", ContentItemKind("guardian.test".into())),);let user: ResponseItem = serde_json::from_value(json!({"type":"message", "role":"user", "content":[{"type":"input_text", "text":"Authorized task"}, {"type":"input_text", "text":"Planned action"}@@ -59,11 +54,7 @@ fn adapter_rejects_unsupported_evidence() {fn adapter_preserves_trusted_tool_authority_and_scope() {let rubric = RenderedFragment::new("developer",- AnnotatedContent::text(- "Classify risk.",- ContentItemKind("guardian.test".into()),- ContentItemMetadata::harness(),- ),+ AnnotatedContent::input_text("Classify risk.", ContentItemKind("guardian.test".into())),);let tool = TrustedTool {server: "example".into(),@@ -133,11 +124,7 @@ async fn http_contract_and_untrusted_response_validation() {let mut request = super::super::sampler::tests::sample_request("turn");request.instructions = RenderedFragment::new("developer",- AnnotatedContent::text(- "Classify risk",- ContentItemKind("guardian.test".into()),- ContentItemMetadata::harness(),- ),+ AnnotatedContent::input_text("Classify risk", ContentItemKind("guardian.test".into())),);let body = json!({"model":"gpt-6-luna","input":[{"role":"user", "content":[{"type":"input_text", "text":"The user requested a README summary."}]}],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 b148f557be..707e0d5f68 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@@ -1379,9 +1379,6 @@ classifier_instructions = "Predict future violations.\n# Security Policy\n{{ ten"role": "developer","internal_chat_message_metadata_passthrough": {"content_item_kinds": ["guardian.classifier_instructions"],- "content_item_metadata": [{- "provenance": {"type": "harness", "hook": false},- }],},"content": [{"type": "input_text",@@ -1424,9 +1421,6 @@ max_classifier_instruction_tokens = 256"role": "developer","internal_chat_message_metadata_passthrough": {"content_item_kinds": ["guardian.classifier_instructions"],- "content_item_metadata": [{- "provenance": {"type": "harness", "hook": false},- }],},"content": [{"type": "input_text",@@ -1511,9 +1505,6 @@ max_recent_non_user_entries = 8"role": "developer","internal_chat_message_metadata_passthrough": {"content_item_kinds": ["guardian.classifier_instructions"],- "content_item_metadata": [{- "provenance": {"type": "harness", "hook": false},- }],},"content": [{"type": "input_text",@@ -1946,9 +1937,6 @@ async fn contributor_uses_model_defaults_and_preserves_local_overrides() -> Resu"role": "developer","internal_chat_message_metadata_passthrough": {"content_item_kinds": ["guardian.classifier_instructions"],- "content_item_metadata": [{- "provenance": {"type": "harness", "hook": false},- }],},"content": [{"type": "input_text",@@ -2130,9 +2118,6 @@ async fn contributor_samples_tool_calls_with_the_existing_luna_pool() -> Result<"role": "developer","internal_chat_message_metadata_passthrough": {"content_item_kinds": ["guardian.classifier_instructions"],- "content_item_metadata": [{- "provenance": {"type": "harness", "hook": false},- }],},"content": [{"type": "input_text",@@ -2828,9 +2813,6 @@ async fn contributor_uses_catalog_policy_without_a_configured_override() -> Resu"role": "developer","internal_chat_message_metadata_passthrough": {"content_item_kinds": ["guardian.classifier_instructions"],- "content_item_metadata": [{- "provenance": {"type": "harness", "hook": false},- }],},"content": [{"type": "input_text",@@ -2877,9 +2859,6 @@ async fn contributor_preserves_uncapped_classifier_instructions() -> Result<()>"role": "developer","internal_chat_message_metadata_passthrough": {"content_item_kinds": ["guardian.classifier_instructions"],- "content_item_metadata": [{- "provenance": {"type": "harness", "hook": false},- }],},"content": [{"type": "input_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 4f1afc5cf8..53397c38db 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@@ -258,9 +258,6 @@ fn assert_classifier_instructions(request: &serde_json::Value) {}],"internal_chat_message_metadata_passthrough": {"content_item_kinds": ["guardian.classifier_instructions"],- "content_item_metadata": [{- "provenance": {"type": "harness", "hook": false},- }],},}));diff --git a/codex-rs/ext/history-notes/src/extension.rs b/codex-rs/ext/history-notes/src/extension.rsindex ff425ec8fa..a5b259f1a9 100644--- a/codex-rs/ext/history-notes/src/extension.rs+++ b/codex-rs/ext/history-notes/src/extension.rs@@ -145,11 +145,10 @@ impl ContextContributor for HistoryNotesExtension {if text.is_empty() {return Vec::new();}- vec![PromptFragment::tool(+ vec![PromptFragment::new(PromptSlot::ContextWindow,text,ContentItemKind("notes.thread_hint".to_string()),- "notes".to_string(),)]})}diff --git a/codex-rs/ext/history-notes/tests/history_notes_extension.rs b/codex-rs/ext/history-notes/tests/history_notes_extension.rsindex 02e7a4d41c..219155a3ca 100644--- a/codex-rs/ext/history-notes/tests/history_notes_extension.rs+++ b/codex-rs/ext/history-notes/tests/history_notes_extension.rs@@ -165,11 +165,10 @@ async fn installed_extension_exposes_and_invokes_history_notes_tools() -> TestRe.await;assert_eq!(hints,- vec![PromptFragment::tool(+ vec![PromptFragment::new(PromptSlot::ContextWindow,THREAD_HINT,ContentItemKind("notes.thread_hint".to_string()),- "notes".to_string(),)]);diff --git a/codex-rs/ext/skills/src/fragments.rs b/codex-rs/ext/skills/src/fragments.rsindex 7ee33f5e5e..0e2e3018db 100644--- a/codex-rs/ext/skills/src/fragments.rs+++ b/codex-rs/ext/skills/src/fragments.rs@@ -1,6 +1,5 @@use codex_extension_api::ContextualUserFragment;use codex_protocol::models::ContentItemKind;-use codex_protocol::models::ContentItemMetadata;use codex_protocol::protocol::SKILLS_INSTRUCTIONS_CLOSE_TAG;use codex_protocol::protocol::SKILLS_INSTRUCTIONS_OPEN_TAG;@@ -38,10 +37,6 @@ impl AvailableSkillsInstructions {}impl ContextualUserFragment for AvailableSkillsInstructions {- fn content_metadata(&self) -> ContentItemMetadata {- ContentItemMetadata::skills()- }-fn role(&self) -> &'static str {"developer"}@@ -79,10 +74,6 @@ pub(crate) struct SkillResourceAccess {}impl ContextualUserFragment for SkillInstructions {- fn content_metadata(&self) -> ContentItemMetadata {- ContentItemMetadata::skills()- }-fn role(&self) -> &'static str {"user"}diff --git a/codex-rs/ext/skills/src/world_state.rs b/codex-rs/ext/skills/src/world_state.rsindex 14a855d616..d4ad2dc041 100644--- a/codex-rs/ext/skills/src/world_state.rs+++ b/codex-rs/ext/skills/src/world_state.rs@@ -1,7 +1,6 @@use codex_extension_api::PreviousWorldStateSection;use codex_extension_api::RenderedWorldStateFragment;use codex_extension_api::WorldStateSectionContribution;-use codex_protocol::models::ContentItemMetadata;use codex_protocol::protocol::SKILLS_INSTRUCTIONS_CLOSE_TAG;use codex_protocol::protocol::SKILLS_INSTRUCTIONS_OPEN_TAG;use serde::Serialize;@@ -83,7 +82,7 @@ pub(crate) fn executor_skills_world_state_section("developer",(SKILLS_INSTRUCTIONS_OPEN_TAG, SKILLS_INSTRUCTIONS_CLOSE_TAG),"\n## Skills update\nThe previously listed selected-environment skills are available again.\n",- ).with_metadata(ContentItemMetadata::skills())),+ )),);}}@@ -103,7 +102,7 @@ pub(crate) fn executor_skills_world_state_section("developer",(SKILLS_INSTRUCTIONS_OPEN_TAG, SKILLS_INSTRUCTIONS_CLOSE_TAG),body,- ).with_metadata(ContentItemMetadata::skills())),+ )),)}).with_legacy_matcher(|role, text| {@@ -188,14 +187,11 @@ fn skills_world_state_section((Some(snapshot.clone()),- Some(- RenderedWorldStateFragment::new(- "developer",- (SKILLS_INSTRUCTIONS_OPEN_TAG, SKILLS_INSTRUCTIONS_CLOSE_TAG),- body,- )- .with_metadata(ContentItemMetadata::skills()),- ),+ Some(RenderedWorldStateFragment::new(+ "developer",+ (SKILLS_INSTRUCTIONS_OPEN_TAG, SKILLS_INSTRUCTIONS_CLOSE_TAG),+ body,+ )),)});match retained_body {diff --git a/codex-rs/hooks/src/context.rs b/codex-rs/hooks/src/context.rsdeleted file mode 100644index d4afe5afe5..0000000000--- a/codex-rs/hooks/src/context.rs+++ /dev/null@@ -1,18 +0,0 @@-//! Model-visible hook context, attributed by the executor that produced it.--use codex_protocol::models::ContentItemMetadata;--#[derive(Debug, Clone, PartialEq, Eq)]-pub struct HookContext {- pub text: String,- pub metadata: ContentItemMetadata,-}--impl HookContext {- pub fn harness(text: String) -> Self {- Self {- text,- metadata: ContentItemMetadata::harness(),- }- }-}diff --git a/codex-rs/hooks/src/engine/command_runner.rs b/codex-rs/hooks/src/engine/command_runner.rsindex d323c2131e..674f5bd2ed 100644--- a/codex-rs/hooks/src/engine/command_runner.rs+++ b/codex-rs/hooks/src/engine/command_runner.rs@@ -43,6 +43,7 @@ use super::dispatcher::hook_handler_type_label;use super::dispatcher::hook_scope_label;use super::dispatcher::hook_source_label;use super::dispatcher::scope_for_event;+use crate::output_spill::AdditionalContext;use crate::output_spill::HookOutputSpiller;use codex_protocol::ThreadId;use codex_protocol::protocol::HookCompletedEvent;@@ -140,17 +141,21 @@ impl CommandHookRuntime {for entry in std::mem::take(&mut hook_result.run.entries) {match entry.kind {HookOutputEntryKind::Context => {- let text = runtime+ if let Some(text) = runtime.output_spiller- .maybe_spill_text_with_limit(- entry.text,- handler.additional_context_limit,- )- .await;- entries.push(HookOutputEntry {- kind: HookOutputEntryKind::Context,- text,- });+ .maybe_spill_additional_contexts(vec![AdditionalContext {+ text: entry.text,+ limit: handler.additional_context_limit,+ }])+ .await+ .into_iter()+ .next()+ {+ entries.push(HookOutputEntry {+ kind: HookOutputEntryKind::Context,+ text,+ });+ }}HookOutputEntryKind::Warning => warnings.push(entry),HookOutputEntryKind::Error => entries.push(entry),@@ -366,7 +371,6 @@ fn finish_command_run() -> HandlerRunResult {Span::current().record("hook.command_outcome", completion.outcome);HandlerRunResult {- context_metadata: codex_protocol::models::ContentItemMetadata::command_hook(),started_at,completed_at: chrono::Utc::now().timestamp(),duration_ms: started.elapsed().as_millis().try_into().unwrap_or(i64::MAX),diff --git a/codex-rs/hooks/src/engine/dispatcher.rs b/codex-rs/hooks/src/engine/dispatcher.rsindex 30c0c34961..b34118d6f2 100644--- a/codex-rs/hooks/src/engine/dispatcher.rs+++ b/codex-rs/hooks/src/engine/dispatcher.rs@@ -146,8 +146,7 @@ pub(crate) async fn execute_handlers_with_metadata<T: 'static>(pending.push(async move {let result =execute_handler(engine, &handler, &input_json, cwd, /*metadata*/ None).await;- let parsed = parse(&handler, result, turn_id);- (configured_order, parsed)+ (configured_order, parse(&handler, result, turn_id))});}diff --git a/codex-rs/hooks/src/engine/mcp_runner.rs b/codex-rs/hooks/src/engine/mcp_runner.rsindex 18cb81e185..71bf050e0f 100644--- a/codex-rs/hooks/src/engine/mcp_runner.rs+++ b/codex-rs/hooks/src/engine/mcp_runner.rs@@ -4,7 +4,6 @@ use std::time::Instant;use anyhow::Context;use anyhow::Result;-use codex_protocol::models::ContentItemMetadata;use regex::Regex;use serde_json::Map;use serde_json::Value;@@ -76,12 +75,11 @@ pub(crate) async fn run_mcp_tool(}.await;- let (exit_code, stdout, error, source_tool_namespace) = match result {- Ok(output) => (Some(0), output.text, None, output.source_tool_namespace),- Err(error) => (None, String::new(), Some(error.to_string()), None),+ let (exit_code, stdout, error) = match result {+ Ok(output) => (Some(0), output, None),+ Err(error) => (None, String::new(), Some(error.to_string())),};HandlerRunResult {- context_metadata: ContentItemMetadata::tool(source_tool_namespace.map(Into::into)),started_at,completed_at: chrono::Utc::now().timestamp(),duration_ms: started.elapsed().as_millis().try_into().unwrap_or(i64::MAX),diff --git a/codex-rs/hooks/src/engine/mcp_runner_tests.rs b/codex-rs/hooks/src/engine/mcp_runner_tests.rsindex 4c4726d284..a16613ea07 100644--- a/codex-rs/hooks/src/engine/mcp_runner_tests.rs+++ b/codex-rs/hooks/src/engine/mcp_runner_tests.rs@@ -15,7 +15,6 @@ use crate::engine::ConfiguredHandler;use crate::engine::ConfiguredHandlerKind;use crate::mcp::HookMcpCall;use crate::mcp::HookMcpExecutor;-use crate::mcp::HookMcpOutput;use codex_protocol::protocol::HookEventName;use codex_protocol::protocol::HookSource;use codex_utils_absolute_path::test_support::PathBufExt;@@ -27,13 +26,10 @@ struct RecordingExecutor {}impl HookMcpExecutor for RecordingExecutor {- fn execute(&self, call: HookMcpCall) -> BoxFuture<'_, anyhow::Result<HookMcpOutput>> {+ fn execute(&self, call: HookMcpCall) -> BoxFuture<'_, anyhow::Result<String>> {async move {self.calls.lock().expect("lock calls").push(call);- Ok(HookMcpOutput {- text: self.output.clone(),- source_tool_namespace: Some("security".into()),- })+ Ok(self.output.clone())}.boxed()}diff --git a/codex-rs/hooks/src/engine/mod.rs b/codex-rs/hooks/src/engine/mod.rsindex f1cd5cf808..a007f3b1a4 100644--- a/codex-rs/hooks/src/engine/mod.rs+++ b/codex-rs/hooks/src/engine/mod.rs@@ -131,7 +131,6 @@ pub(crate) enum ConfiguredHandlerKind {#[derive(Debug)]pub(crate) struct HandlerRunResult {- pub context_metadata: codex_protocol::models::ContentItemMetadata,pub started_at: i64,pub completed_at: i64,pub duration_ms: i64,diff --git a/codex-rs/hooks/src/engine/mod_tests.rs b/codex-rs/hooks/src/engine/mod_tests.rsindex 43167e78a1..a185e45029 100644--- a/codex-rs/hooks/src/engine/mod_tests.rs+++ b/codex-rs/hooks/src/engine/mod_tests.rs@@ -51,7 +51,6 @@ use crate::events::stop::StopHookTarget;use crate::events::stop::StopRequest;use crate::mcp::HookMcpCall;use crate::mcp::HookMcpExecutor;-use crate::mcp::HookMcpOutput;fn cwd() -> AbsolutePathBuf {AbsolutePathBuf::current_dir().expect("current dir")@@ -2238,7 +2237,7 @@ struct StaticMcpExecutor {}impl HookMcpExecutor for StaticMcpExecutor {- fn execute(&self, call: HookMcpCall) -> BoxFuture<'_, anyhow::Result<HookMcpOutput>> {+ fn execute(&self, call: HookMcpCall) -> BoxFuture<'_, anyhow::Result<String>> {async move {let output = self.outputs_by_tool@@ -2246,10 +2245,7 @@ impl HookMcpExecutor for StaticMcpExecutor {.unwrap_or(&self.output).clone();self.calls.lock().expect("lock MCP calls").push(call);- Ok(HookMcpOutput {- text: output,- source_tool_namespace: None,- })+ Ok(output)}.boxed()}@@ -2654,14 +2650,11 @@ async fn executor_stop_hooks_do_not_delay_stop_completion() {}impl HookMcpExecutor for BlockingMcpExecutor {- fn execute(&self, _call: HookMcpCall) -> BoxFuture<'_, anyhow::Result<HookMcpOutput>> {+ fn execute(&self, _call: HookMcpCall) -> BoxFuture<'_, anyhow::Result<String>> {async move {self.started.notify_one();self.release.notified().await;- Ok(HookMcpOutput {- text: String::new(),- source_tool_namespace: None,- })+ Ok(String::new())}.boxed()}diff --git a/codex-rs/hooks/src/events/common.rs b/codex-rs/hooks/src/events/common.rsindex 2a58d51634..c6e1a1d324 100644--- a/codex-rs/hooks/src/events/common.rs+++ b/codex-rs/hooks/src/events/common.rs@@ -9,7 +9,6 @@ use crate::engine::ConfiguredHandler;use crate::engine::HandlerSourcePath;use crate::engine::dispatcher;use crate::output_spill::AdditionalContext;-use codex_protocol::models::ContentItemMetadata;/// Identifies a thread-spawned subagent when a normal hook runs inside it.#[derive(Debug, Clone, PartialEq, Eq)]@@ -40,17 +39,13 @@ pub(crate) fn append_additional_context(additional_contexts_for_model: &mut Vec<AdditionalContext>,handler: &ConfiguredHandler,additional_context: String,- metadata: &ContentItemMetadata,) {entries.push(HookOutputEntry {kind: HookOutputEntryKind::Context,text: additional_context.clone(),});additional_contexts_for_model.push(AdditionalContext {- context: crate::HookContext {- text: additional_context,- metadata: metadata.clone(),- },+ text: additional_context,limit: handler.additional_context_limit,});}@@ -58,7 +53,10 @@ pub(crate) fn append_additional_context(pub(crate) fn flatten_additional_contexts<'a>(additional_contexts: impl IntoIterator<Item = &'a [AdditionalContext]>,) -> Vec<AdditionalContext> {- additional_contexts.into_iter().flatten().cloned().collect()+ additional_contexts+ .into_iter()+ .flat_map(|chunk| chunk.iter().cloned())+ .collect()}pub(crate) fn serialization_failure_hook_events(diff --git a/codex-rs/hooks/src/events/compact.rs b/codex-rs/hooks/src/events/compact.rsindex 2509baae46..82bd6c6cf5 100644--- a/codex-rs/hooks/src/events/compact.rs+++ b/codex-rs/hooks/src/events/compact.rs@@ -542,7 +542,6 @@ mod tests {fn run_result(exit_code: Option<i32>, stdout: &str, stderr: &str) -> HandlerRunResult {HandlerRunResult {- context_metadata: codex_protocol::models::ContentItemMetadata::harness(),started_at: 1_700_000_000,completed_at: 1_700_000_001,duration_ms: 12,diff --git a/codex-rs/hooks/src/events/interrupt_tests.rs b/codex-rs/hooks/src/events/interrupt_tests.rsindex 7ce3822126..3d8642c845 100644--- a/codex-rs/hooks/src/events/interrupt_tests.rs+++ b/codex-rs/hooks/src/events/interrupt_tests.rs@@ -117,7 +117,6 @@ fn handler() -> ConfiguredHandler {fn run_result(exit_code: Option<i32>, stdout: &str, stderr: &str) -> HandlerRunResult {HandlerRunResult {- context_metadata: codex_protocol::models::ContentItemMetadata::harness(),started_at: 1,completed_at: 2,duration_ms: 1,diff --git a/codex-rs/hooks/src/events/post_tool_use.rs b/codex-rs/hooks/src/events/post_tool_use.rsindex 1c62d364d1..0ca0f6c673 100644--- a/codex-rs/hooks/src/events/post_tool_use.rs+++ b/codex-rs/hooks/src/events/post_tool_use.rs@@ -40,7 +40,7 @@ pub struct PostToolUseRequest {pub struct PostToolUseOutcome {pub hook_events: Vec<HookCompletedEvent>,pub should_block: bool,- pub additional_contexts: Vec<crate::HookContext>,+ pub additional_contexts: Vec<String>,pub feedback_message: Option<String>,}@@ -206,7 +206,6 @@ fn parse_completed(&mut additional_contexts_for_model,handler,additional_context,- &run_result.context_metadata,);}if handler.can_apply_control_effects() {@@ -392,9 +391,7 @@ mod tests {PostToolUseHandlerData {should_block: false,additional_contexts_for_model: vec![AdditionalContext {- context: crate::HookContext::harness(- "Remember the bash cleanup note.".to_string()- ),+ text: "Remember the bash cleanup note.".to_string(),limit: AdditionalContextLimit::from_config(Some(17)),}],feedback_messages_for_model: Vec::new(),@@ -611,7 +608,6 @@ mod tests {fn run_result(exit_code: Option<i32>, stdout: &str, stderr: &str) -> HandlerRunResult {HandlerRunResult {- context_metadata: codex_protocol::models::ContentItemMetadata::harness(),started_at: 1_700_000_000,completed_at: 1_700_000_001,duration_ms: 12,diff --git a/codex-rs/hooks/src/events/pre_tool_use.rs b/codex-rs/hooks/src/events/pre_tool_use.rsindex a47b1ff2b0..e57b823a1c 100644--- a/codex-rs/hooks/src/events/pre_tool_use.rs+++ b/codex-rs/hooks/src/events/pre_tool_use.rs@@ -40,7 +40,7 @@ pub struct PreToolUseOutcome {pub hook_events: Vec<HookCompletedEvent>,pub should_block: bool,pub block_reason: Option<String>,- pub additional_contexts: Vec<crate::HookContext>,+ pub additional_contexts: Vec<String>,pub updated_input: Option<Value>,}@@ -229,7 +229,6 @@ fn parse_completed(&mut additional_contexts_for_model,handler,additional_context,- &run_result.context_metadata,);}if handler.can_apply_control_effects() {@@ -531,7 +530,7 @@ mod tests {should_block: true,block_reason: Some("do not run that".to_string()),additional_contexts_for_model: vec![AdditionalContext {- context: crate::HookContext::harness("remember this".to_string()),+ text: "remember this".to_string(),limit: Default::default(),}],updated_input: None,@@ -631,7 +630,7 @@ mod tests {should_block: true,block_reason: Some("do not run that".to_string()),additional_contexts_for_model: vec![AdditionalContext {- context: crate::HookContext::harness("nope".to_string()),+ text: "nope".to_string(),limit: AdditionalContextLimit::from_config(Some(13)),}],updated_input: None,@@ -793,7 +792,6 @@ mod tests {fn run_result(exit_code: Option<i32>, stdout: &str, stderr: &str) -> HandlerRunResult {HandlerRunResult {- context_metadata: codex_protocol::models::ContentItemMetadata::harness(),started_at: 1,completed_at: 2,duration_ms: 1,diff --git a/codex-rs/hooks/src/events/session_end_tests.rs b/codex-rs/hooks/src/events/session_end_tests.rsindex 2a1ada4a78..05fa107d4f 100644--- a/codex-rs/hooks/src/events/session_end_tests.rs+++ b/codex-rs/hooks/src/events/session_end_tests.rs@@ -43,7 +43,6 @@ fn session_end_ignores_successful_output() {let completed = parse_completed(&handler(/*matcher*/ None),HandlerRunResult {- context_metadata: codex_protocol::models::ContentItemMetadata::harness(),started_at: 1,completed_at: 2,duration_ms: 1,diff --git a/codex-rs/hooks/src/events/session_start.rs b/codex-rs/hooks/src/events/session_start.rsindex 79ea63f335..3aff0fe946 100644--- a/codex-rs/hooks/src/events/session_start.rs+++ b/codex-rs/hooks/src/events/session_start.rs@@ -84,7 +84,7 @@ pub struct SessionStartOutcome {pub hook_events: Vec<HookCompletedEvent>,pub should_stop: bool,pub stop_reason: Option<String>,- pub additional_contexts: Vec<crate::HookContext>,+ pub additional_contexts: Vec<String>,}#[derive(Debug, PartialEq, Eq)]@@ -267,7 +267,6 @@ fn parse_completed(&mut additional_contexts_for_model,handler,additional_context,- &run_result.context_metadata,);}let _ = parsed.universal.suppress_output;@@ -309,7 +308,6 @@ fn parse_completed(&mut additional_contexts_for_model,handler,additional_context,- &run_result.context_metadata,);}}@@ -388,7 +386,7 @@ mod tests {should_stop: false,stop_reason: None,additional_contexts_for_model: vec![AdditionalContext {- context: crate::HookContext::harness("hello from hook".to_string()),+ text: "hello from hook".to_string(),limit: AdditionalContextLimit::from_config(Some(7)),}],}@@ -421,7 +419,7 @@ mod tests {should_stop: true,stop_reason: Some("pause".to_string()),additional_contexts_for_model: vec![AdditionalContext {- context: crate::HookContext::harness("do not inject".to_string()),+ text: "do not inject".to_string(),limit: Default::default(),}],}@@ -488,7 +486,7 @@ mod tests {should_stop: false,stop_reason: None,additional_contexts_for_model: vec![AdditionalContext {- context: crate::HookContext::harness("hello from subagent hook".to_string()),+ text: "hello from subagent hook".to_string(),limit: AdditionalContextLimit::from_config(Some(4_096)),}],}@@ -522,7 +520,7 @@ mod tests {should_stop: false,stop_reason: None,additional_contexts_for_model: vec![AdditionalContext {- context: crate::HookContext::harness("child context".to_string()),+ text: "child context".to_string(),limit: Default::default(),}],}@@ -563,7 +561,6 @@ mod tests {fn run_result(exit_code: Option<i32>, stdout: &str, stderr: &str) -> HandlerRunResult {HandlerRunResult {- context_metadata: codex_protocol::models::ContentItemMetadata::harness(),started_at: 1,completed_at: 2,duration_ms: 1,diff --git a/codex-rs/hooks/src/events/stop.rs b/codex-rs/hooks/src/events/stop.rsindex 5e2b300153..be2be9100e 100644--- a/codex-rs/hooks/src/events/stop.rs+++ b/codex-rs/hooks/src/events/stop.rs@@ -390,11 +390,10 @@ fn parse_completed(};let continuation_fragments = continuation_prompt.map(|prompt| {- vec![HookPromptFragment {- text: prompt,- hook_run_id: completed.run.id.clone(),- metadata: run_result.context_metadata,- }]+ vec![HookPromptFragment::from_single_hook(+ prompt,+ completed.run.id.clone(),+ )]}).unwrap_or_default();@@ -498,7 +497,6 @@ mod tests {continuation_fragments: vec![HookPromptFragment {text: "retry with tests".to_string(),hook_run_id: parsed.completed.run.id.clone(),- metadata: codex_protocol::models::ContentItemMetadata::harness(),}],});@@ -576,7 +574,6 @@ mod tests {continuation_fragments: vec![HookPromptFragment {text: "retry with tests".to_string(),hook_run_id: parsed.completed.run.id.clone(),- metadata: codex_protocol::models::ContentItemMetadata::harness(),}],});@@ -714,7 +711,6 @@ mod tests {fn run_result(exit_code: Option<i32>, stdout: &str, stderr: &str) -> HandlerRunResult {HandlerRunResult {- context_metadata: codex_protocol::models::ContentItemMetadata::harness(),started_at: 1,completed_at: 2,duration_ms: 1,diff --git a/codex-rs/hooks/src/events/user_prompt_submit.rs b/codex-rs/hooks/src/events/user_prompt_submit.rsindex bc856b251a..9124431bc1 100644--- a/codex-rs/hooks/src/events/user_prompt_submit.rs+++ b/codex-rs/hooks/src/events/user_prompt_submit.rs@@ -37,7 +37,7 @@ pub struct UserPromptSubmitOutcome {pub hook_events: Vec<HookCompletedEvent>,pub should_stop: bool,pub stop_reason: Option<String>,- pub additional_contexts: Vec<crate::HookContext>,+ pub additional_contexts: Vec<String>,}#[derive(Debug, PartialEq, Eq)]@@ -176,7 +176,6 @@ fn parse_completed(&mut additional_contexts_for_model,handler,additional_context,- &run_result.context_metadata,);}let _ = parsed.universal.suppress_output;@@ -222,7 +221,6 @@ fn parse_completed(&mut additional_contexts_for_model,handler,additional_context,- &run_result.context_metadata,);}}@@ -319,7 +317,7 @@ mod tests {should_stop: true,stop_reason: Some("pause".to_string()),additional_contexts_for_model: vec![AdditionalContext {- context: crate::HookContext::harness("do not inject".to_string()),+ text: "do not inject".to_string(),limit: Default::default(),}],}@@ -358,7 +356,7 @@ mod tests {should_stop: true,stop_reason: Some("slow down".to_string()),additional_contexts_for_model: vec![AdditionalContext {- context: crate::HookContext::harness("do not inject".to_string()),+ text: "do not inject".to_string(),limit: Default::default(),}],}@@ -482,7 +480,6 @@ mod tests {fn run_result(exit_code: Option<i32>, stdout: &str, stderr: &str) -> HandlerRunResult {HandlerRunResult {- context_metadata: codex_protocol::models::ContentItemMetadata::harness(),started_at: 1,completed_at: 2,duration_ms: 1,diff --git a/codex-rs/hooks/src/lib.rs b/codex-rs/hooks/src/lib.rsindex 9be500af78..6abc173535 100644--- a/codex-rs/hooks/src/lib.rs+++ b/codex-rs/hooks/src/lib.rs@@ -1,5 +1,4 @@mod config_rules;-mod context;mod declarations;mod engine;pub(crate) mod events;@@ -53,7 +52,6 @@ pub const HOOK_EVENT_NAMES_WITH_MATCHERS: [&str; 9] = ["SubagentStop",];-pub use context::HookContext;pub use events::compact::PostCompactRequest;pub use events::compact::PreCompactOutcome;pub use events::compact::PreCompactRequest;@@ -81,7 +79,6 @@ pub use events::user_prompt_submit::UserPromptSubmitRequest;pub use legacy_notify::legacy_notify_json;pub use mcp::HookMcpCall;pub use mcp::HookMcpExecutor;-pub use mcp::HookMcpOutput;pub use registry::HookListOutcome;pub use registry::Hooks;pub use registry::HooksConfig;diff --git a/codex-rs/hooks/src/mcp.rs b/codex-rs/hooks/src/mcp.rsindex ca95d7b0cb..49d907df80 100644--- a/codex-rs/hooks/src/mcp.rs+++ b/codex-rs/hooks/src/mcp.rs@@ -15,16 +15,10 @@ pub struct HookMcpCall {pub timeout: Duration,}-/// Text returned by an MCP hook and the callable namespace that supplied it.-pub struct HookMcpOutput {- pub text: String,- pub source_tool_namespace: Option<String>,-}-/// Executes already-connected MCP tools on behalf of hooks without coupling this crate to core.////// Implementations own server readiness, policy enforcement, timeout handling, and elicitation.pub trait HookMcpExecutor: Send + Sync {/// Returns text that is interpreted using ordinary command-hook output semantics.- fn execute(&self, call: HookMcpCall) -> BoxFuture<'_, anyhow::Result<HookMcpOutput>>;+ fn execute(&self, call: HookMcpCall) -> BoxFuture<'_, anyhow::Result<String>>;}diff --git a/codex-rs/hooks/src/output_spill.rs b/codex-rs/hooks/src/output_spill.rsindex a11eebf078..b60ac97399 100644--- a/codex-rs/hooks/src/output_spill.rs+++ b/codex-rs/hooks/src/output_spill.rs@@ -1,4 +1,3 @@-use crate::HookContext;use codex_protocol::ThreadId;use codex_protocol::items::HookPromptFragment;use codex_utils_absolute_path::AbsolutePathBuf;@@ -33,7 +32,7 @@ impl Default for AdditionalContextLimit {#[derive(Debug, Clone, PartialEq, Eq)]pub(crate) struct AdditionalContext {- pub context: HookContext,+ pub text: String,pub limit: AdditionalContextLimit,}@@ -62,7 +61,7 @@ impl HookOutputSpiller {.await}- pub(crate) async fn maybe_spill_text_with_limit(+ async fn maybe_spill_text_with_limit(&self,text: String,limit: AdditionalContextLimit,@@ -94,11 +93,13 @@ impl HookOutputSpiller {pub(crate) async fn maybe_spill_additional_contexts(&self,contexts: Vec<AdditionalContext>,- ) -> Vec<HookContext> {+ ) -> Vec<String> {let mut spilled = Vec::with_capacity(contexts.len());- for AdditionalContext { mut context, limit } in contexts {- context.text = self.maybe_spill_text_with_limit(context.text, limit).await;- spilled.push(context);+ for context in contexts {+ spilled.push(+ self.maybe_spill_text_with_limit(context.text, context.limit)+ .await,+ );}spilled}@@ -112,7 +113,6 @@ impl HookOutputSpiller {spilled.push(HookPromptFragment {text: self.maybe_spill_text(fragment.text).await,hook_run_id: fragment.hook_run_id,- metadata: fragment.metadata,});}spilleddiff --git a/codex-rs/hooks/src/output_spill_tests.rs b/codex-rs/hooks/src/output_spill_tests.rsindex 6bbd90e33c..6b72c956ce 100644--- a/codex-rs/hooks/src/output_spill_tests.rs+++ b/codex-rs/hooks/src/output_spill_tests.rs@@ -60,15 +60,15 @@ async fn additional_contexts_apply_limits_individually() -> Result<()> {let output = spiller.maybe_spill_additional_contexts(vec![AdditionalContext {- context: crate::HookContext::harness(limited_text.clone()),+ text: limited_text.clone(),limit: AdditionalContextLimit::from_config(Some(1)),},AdditionalContext {- context: crate::HookContext::harness(unlimited_text.clone()),+ text: unlimited_text.clone(),limit: AdditionalContextLimit::from_config(Some(0)),},AdditionalContext {- context: crate::HookContext::harness(unlimited_text.clone()),+ text: unlimited_text.clone(),limit: AdditionalContextLimit::from_config(Some(usize::MAX)),},])@@ -76,8 +76,8 @@ async fn additional_contexts_apply_limits_individually() -> Result<()> {let [limited_output, zero_limit_output, high_limit_output] = output.as_slice() else {panic!("expected one output for each additional context");};- assert!(limited_output.text.contains("Full hook output saved to:"));- assert_eq!(&zero_limit_output.text, &unlimited_text);- assert_eq!(&high_limit_output.text, &unlimited_text);+ assert!(limited_output.contains("Full hook output saved to:"));+ assert_eq!(zero_limit_output, &unlimited_text);+ assert_eq!(high_limit_output, &unlimited_text);Ok(())}diff --git a/codex-rs/prompts/src/multi_agent_instructions_tests.rs b/codex-rs/prompts/src/multi_agent_instructions_tests.rsindex ba3078823c..82fbb871ad 100644--- a/codex-rs/prompts/src/multi_agent_instructions_tests.rs+++ b/codex-rs/prompts/src/multi_agent_instructions_tests.rs@@ -3,7 +3,6 @@use super::*;use codex_context_fragments::AnnotatedContent;use codex_context_fragments::RenderedFragment;-use codex_protocol::models::ContentItemMetadata;use pretty_assertions::assert_eq;#[test]@@ -33,10 +32,9 @@ fn role_segment_filters_base_and_appends_bundled_guidance() {instructions.render_fragment(),RenderedFragment::new("developer",- AnnotatedContent::text(+ AnnotatedContent::input_text(expected_text,ContentItemKind("multi_agent.role_instructions".to_string()),- ContentItemMetadata::harness(),),),);diff --git a/codex-rs/prompts/src/permissions_instructions_tests.rs b/codex-rs/prompts/src/permissions_instructions_tests.rsindex 51a8492f4a..586fcc134a 100644--- a/codex-rs/prompts/src/permissions_instructions_tests.rs+++ b/codex-rs/prompts/src/permissions_instructions_tests.rs@@ -4,7 +4,6 @@ use super::*;use crate::ResolvedModelMessages;use codex_context_fragments::AnnotatedContent;use codex_context_fragments::RenderedFragment;-use codex_protocol::models::ContentItemMetadata;use codex_protocol::openai_models::ApprovalMessages;use codex_protocol::openai_models::PermissionMessages;use codex_protocol::permissions::FileSystemAccessMode;@@ -739,10 +738,9 @@ fn preserves_supplied_path_spellings_and_order() {instructions.render_fragment(),RenderedFragment::new("developer",- AnnotatedContent::text(+ AnnotatedContent::input_text(format!("<permissions instructions>{expected_body}</permissions instructions>"),ContentItemKind("permissions.instructions".to_string()),- ContentItemMetadata::harness(),),),);diff --git a/codex-rs/protocol/src/items.rs b/codex-rs/protocol/src/items.rsindex d44ffbc868..8cf7e4646d 100644--- a/codex-rs/protocol/src/items.rs+++ b/codex-rs/protocol/src/items.rs@@ -5,11 +5,9 @@ use crate::dynamic_tools::DynamicToolCallOutputContentItem;use crate::mcp::CallToolResult;use crate::memory_citation::MemoryCitation;use crate::models::ContentItem;-use crate::models::ContentItemMetadata;use crate::models::FunctionCallOutputBody;use crate::models::ImageDetail;use crate::models::ImageReference;-use crate::models::InternalChatMessageMetadataPassthrough;use crate::models::MessagePhase;use crate::models::ResponseItem;use crate::models::WebSearchAction;@@ -110,11 +108,6 @@ pub struct HookPromptItem {pub struct HookPromptFragment {pub text: String,pub hook_run_id: String,- /// Emission-time attribution; persisted on the ResponseItem, not the UI hook fragment.- #[serde(skip)]- #[ts(skip)]- #[schemars(skip)]- pub metadata: ContentItemMetadata,}#[derive(Debug, Deserialize, Serialize)]@@ -675,20 +668,19 @@ impl HookPromptFragment {Self {text: text.into(),hook_run_id: hook_run_id.into(),- metadata: ContentItemMetadata::default(),}}}pub fn build_hook_prompt_message(fragments: &[HookPromptFragment]) -> Option<ResponseItem> {- let mut content = Vec::new();- let mut metadata = Vec::new();- for fragment in fragments {- if let Some(text) = serialize_hook_prompt_fragment(&fragment.text, &fragment.hook_run_id) {- content.push(ContentItem::InputText { text });- metadata.push(fragment.metadata.clone());- }- }+ let content = fragments+ .iter()+ .filter(|fragment| !fragment.hook_run_id.trim().is_empty())+ .filter_map(|fragment| {+ serialize_hook_prompt_fragment(&fragment.text, &fragment.hook_run_id)+ .map(|text| ContentItem::InputText { text })+ })+ .collect::<Vec<_>>();if content.is_empty() {return None;@@ -699,13 +691,7 @@ pub fn build_hook_prompt_message(fragments: &[HookPromptFragment]) -> Option<Resrole: "user".to_string(),content,phase: None,- internal_chat_message_metadata_passthrough: metadata- .iter()- .any(|part| part != &ContentItemMetadata::default())- .then_some(InternalChatMessageMetadataPassthrough {- content_item_metadata: Some(metadata),- ..Default::default()- }),+ internal_chat_message_metadata_passthrough: None,})}@@ -737,7 +723,7 @@ pub fn parse_hook_prompt_fragment(text: &str) -> Option<HookPromptFragment> {return None;}- Some(HookPromptFragment::from_single_hook(text, hook_run_id))+ Some(HookPromptFragment { text, hook_run_id })}fn serialize_hook_prompt_fragment(text: &str, hook_run_id: &str) -> Option<String> {@@ -877,7 +863,6 @@ mod tests {HookPromptFragment {text: "Retry with tests.".to_string(),hook_run_id: "hook-run-1".to_string(),- metadata: Default::default(),});}diff --git a/codex-rs/protocol/src/models.rs b/codex-rs/protocol/src/models.rsindex 28b70155ad..524d4e35c2 100644--- a/codex-rs/protocol/src/models.rs+++ b/codex-rs/protocol/src/models.rs@@ -52,9 +52,6 @@ pub use executed_tool_calls::bound_executed_tool_calls_for_message;pub use executed_tool_calls::executed_tool_call_metadata_bytes;pub use executed_tool_calls::normalize_executed_tool_call_completeness;pub use item_metadata::ContentItemKind;-pub use item_metadata::ContentItemMetadata;-pub use item_metadata::ContentItemNamespace;-pub use item_metadata::ContentItemProvenance;/// Controls the per-command sandbox override requested by a shell-like tool call.#[derive(@@ -977,12 +974,6 @@ pub struct InternalChatMessageMetadataPassthrough {#[schemars(skip)]#[ts(skip)]pub content_item_kinds: Option<Vec<ContentItemKind>>,- /// Positional source attribution for `content`; missing historical entries are Unknown.- #[serde_as(deserialize_as = "serde_with::DefaultOnError")]- #[serde(default, skip_serializing_if = "Option::is_none")]- #[schemars(skip)]- #[ts(skip)]- pub content_item_metadata: Option<Vec<ContentItemMetadata>>,// Ignore input values so requests and rollout reloads cannot fake tool call records.// A resumed thread can record new calls, but cannot prove old calls from this payload./// Host-owned Code Mode cell shared by its `exec` and subsequent `wait` outputs.@@ -1418,7 +1409,7 @@ impl ResponseItem {}}- /// Removes content item classifications and attribution, preserving other metadata.+ /// Removes content item classifications while preserving other passthrough metadata.pub fn clear_content_item_kinds(&mut self) {let Some(metadata) = self.internal_chat_message_metadata_passthrough_mut() else {return;@@ -1428,24 +1419,11 @@ impl ResponseItem {};metadata_value.content_item_kinds = None;- metadata_value.content_item_metadata = None;if metadata_value == &InternalChatMessageMetadataPassthrough::default() {*metadata = None;}}- /// Removes per-content attribution for endpoints that do not yet accept it.- pub fn clear_content_item_metadata(&mut self) {- if let Some(metadata) = self.internal_chat_message_metadata_passthrough_mut()- && let Some(value) = metadata- {- value.content_item_metadata = None;- if value == &InternalChatMessageMetadataPassthrough::default() {- *metadata = None;- }- }- }-fn internal_chat_message_metadata_passthrough(&self,) -> Option<&InternalChatMessageMetadataPassthrough> {diff --git a/codex-rs/protocol/src/models/executed_tool_calls.rs b/codex-rs/protocol/src/models/executed_tool_calls.rsindex 95151c2694..7b2fe4c2d5 100644--- a/codex-rs/protocol/src/models/executed_tool_calls.rs+++ b/codex-rs/protocol/src/models/executed_tool_calls.rs@@ -37,7 +37,6 @@ fn executed_tool_call_metadata_field_bytes(} else if metadata.turn_id.is_some()|| metadata.create_time.is_some()|| metadata.content_item_kinds.is_some()- || metadata.content_item_metadata.is_some(){bytes + 1} else {diff --git a/codex-rs/protocol/src/models/item_metadata.rs b/codex-rs/protocol/src/models/item_metadata.rsindex c3d1326697..af08dfa827 100644--- a/codex-rs/protocol/src/models/item_metadata.rs+++ b/codex-rs/protocol/src/models/item_metadata.rs@@ -1,5 +1,3 @@-//! Per-part context sources, independent of message role, visibility, and trust.-use serde::Deserialize;use serde::Serialize;@@ -14,151 +12,6 @@ impl ContentItemKind {}}-/// A callable namespace. Built-ins are typed; configured and MCP namespaces stay open.-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]-#[serde(from = "String", into = "String")]-pub enum ContentItemNamespace {- Clock,- Functions,- ToolSearch,- Collaboration,- MultiAgentV1,- Other(String),-}--impl From<String> for ContentItemNamespace {- fn from(namespace: String) -> Self {- match namespace.as_str() {- "clock" => Self::Clock,- "functions" => Self::Functions,- "tool_search" => Self::ToolSearch,- "collaboration" => Self::Collaboration,- "multi_agent_v1" => Self::MultiAgentV1,- _ => Self::Other(namespace),- }- }-}--impl From<ContentItemNamespace> for String {- fn from(namespace: ContentItemNamespace) -> Self {- match namespace {- ContentItemNamespace::Clock => "clock".to_string(),- ContentItemNamespace::Functions => "functions".to_string(),- ContentItemNamespace::ToolSearch => "tool_search".to_string(),- ContentItemNamespace::Collaboration => "collaboration".to_string(),- ContentItemNamespace::MultiAgentV1 => "multi_agent_v1".to_string(),- ContentItemNamespace::Other(namespace) => namespace,- }- }-}--/// Who supplied a part. Tool-related context remains Tool even when the harness writes it.-#[derive(Debug, Clone, Default, Serialize, Deserialize, PartialEq, Eq)]-#[serde(tag = "type", rename_all = "snake_case")]-pub enum ContentItemProvenance {- /// History saved before attribution, or content whose source is not known.- #[default]- #[serde(alias = "user_configured")]- Unknown,- /// The regular developer-instruction slot or additional requirements-layer instructions.- DeveloperInstructions { from_additional_requirements: bool },- /// Skill catalogs, usage guidance, and selected skill contents.- Skills,- /// Instructions loaded from AGENTS.md.- AgentsMd,- /// Harness-managed context; command-hook output is distinguished from built-in context.- Harness {- #[serde(default)]- hook: bool,- },- /// A tool result or tool-specific context; an unlisted tool can have no known namespace.- Tool {- #[serde(default, skip_serializing_if = "Option::is_none")]- namespace: Option<ContentItemNamespace>,- },- /// Ordinary user input, not an injected instruction fragment with a user role.- User,-}--/// Attribution for one position in a harness-emitted item's content array.-#[derive(Debug, Clone, Default, Serialize, PartialEq, Eq)]-pub struct ContentItemMetadata {- pub provenance: ContentItemProvenance,-}--impl<'de> Deserialize<'de> for ContentItemMetadata {- fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {- // Older records may lack attribution. Neither the old user_configured category- // nor a bare harness_injected:false identifies a source precisely enough.- #[derive(Deserialize)]- struct StoredMetadata {- #[serde(default)]- provenance: Option<ContentItemProvenance>,- #[serde(default)]- harness_injected: Option<bool>,- #[serde(default)]- source_tool_namespace: Option<String>,- }- let stored = StoredMetadata::deserialize(deserializer)?;- let provenance = stored.provenance.unwrap_or_else(|| {- match (stored.source_tool_namespace, stored.harness_injected) {- (Some(namespace), _) => ContentItemProvenance::Tool {- namespace: Some(namespace.into()),- },- (None, Some(true)) => ContentItemProvenance::Harness { hook: false },- (None, Some(false) | None) => ContentItemProvenance::Unknown,- }- });- Ok(Self { provenance })- }-}--impl ContentItemMetadata {- pub fn harness() -> Self {- Self {- provenance: ContentItemProvenance::Harness { hook: false },- }- }-- pub fn command_hook() -> Self {- Self {- provenance: ContentItemProvenance::Harness { hook: true },- }- }-- pub fn developer_instructions(from_additional_requirements: bool) -> Self {- Self {- provenance: ContentItemProvenance::DeveloperInstructions {- from_additional_requirements,- },- }- }-- pub fn skills() -> Self {- Self {- provenance: ContentItemProvenance::Skills,- }- }-- pub fn agents_md() -> Self {- Self {- provenance: ContentItemProvenance::AgentsMd,- }- }-- pub fn user() -> Self {- Self {- provenance: ContentItemProvenance::User,- }- }-- pub fn tool(namespace: Option<ContentItemNamespace>) -> Self {- Self {- provenance: ContentItemProvenance::Tool { namespace },- }- }-}-#[cfg(test)]#[path = "item_metadata_tests.rs"]mod tests;