This commit is contained in:
Roy Han
2026-03-22 22:20:37 -07:00
307 changed files with 9176 additions and 2142 deletions
+17
View File
@@ -0,0 +1,17 @@
use crate::models::ResponseInputItem;
use crate::models::ResponseItemMessageMetadata;
use crate::models::UserMessageType;
pub fn stamp_user_message_type_on_input_item(item: &mut ResponseInputItem, kind: UserMessageType) {
let ResponseInputItem::Message { role, metadata, .. } = item else {
return;
};
if role != "user" {
return;
}
let mut metadata_value = metadata
.take()
.unwrap_or_else(|| ResponseItemMessageMetadata::new(/*user_message_type*/ None));
metadata_value.user_message_type = Some(kind);
*metadata = Some(metadata_value);
}
+1
View File
@@ -5,6 +5,7 @@ pub mod approvals;
pub mod config_types;
pub mod custom_prompts;
pub mod dynamic_tools;
pub mod item_metadata;
pub mod items;
pub mod mcp;
pub mod memory_citation;
+36 -80
View File
@@ -230,7 +230,7 @@ pub enum ResponseInputItem {
content: Vec<ContentItem>,
#[serde(default, skip_serializing_if = "Option::is_none")]
#[ts(optional)]
metadata: Option<ResponseItemMetadata>,
metadata: Option<ResponseItemMessageMetadata>,
},
FunctionCallOutput {
call_id: String,
@@ -313,20 +313,12 @@ pub struct ResponseItemMetadata {
impl ResponseItemMetadata {
pub fn is_empty(&self) -> bool {
self.user_message_type.is_none()
&& self.uuid.is_none()
&& self.sandbox_policy.is_none()
self.sandbox_policy.is_none()
&& self.is_tool_call_escalated.is_none()
&& self.review_decision.is_none()
}
pub fn merge_from(&mut self, other: Self) {
if other.user_message_type.is_some() {
self.user_message_type = other.user_message_type;
}
if other.uuid.is_some() {
self.uuid = other.uuid;
}
if other.sandbox_policy.is_some() {
self.sandbox_policy = other.sandbox_policy;
}
@@ -339,41 +331,26 @@ impl ResponseItemMetadata {
}
}
impl ResponseItem {
/// Ensures message metadata includes a generated UUID.
pub fn with_generated_metadata_uuid(self) -> Self {
match self {
ResponseItem::Message {
id,
role,
content,
metadata,
end_turn,
phase,
} => {
let metadata = ensure_generated_metadata_uuid(metadata);
ResponseItem::Message {
id,
role,
content,
metadata,
end_turn,
phase,
}
}
other => other,
}
}
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, JsonSchema, TS)]
pub struct ResponseItemMessageMetadata {
#[serde(default, skip_serializing_if = "Option::is_none")]
#[ts(optional)]
pub user_message_type: Option<UserMessageType>,
#[serde(default, skip_serializing_if = "Option::is_none")]
#[ts(optional)]
pub sandbox_policy: Option<SandboxPolicyMetadata>,
/// Client-visible metadata ID generated by Codex for this item.
pub metadata_id: String,
}
fn ensure_generated_metadata_uuid(
metadata: Option<ResponseItemMetadata>,
) -> Option<ResponseItemMetadata> {
let mut metadata = metadata.unwrap_or_default();
if metadata.uuid.is_none() {
metadata.uuid = Some(uuid::Uuid::new_v4().to_string());
impl ResponseItemMessageMetadata {
pub fn new(user_message_type: Option<UserMessageType>) -> Self {
Self {
user_message_type,
sandbox_policy: None,
metadata_id: uuid::Uuid::new_v4().to_string(),
}
}
Some(metadata)
}
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, JsonSchema, TS)]
@@ -420,7 +397,7 @@ pub enum ResponseItem {
content: Vec<ContentItem>,
#[serde(default, skip_serializing_if = "Option::is_none")]
#[ts(optional)]
metadata: Option<ResponseItemMetadata>,
metadata: Option<ResponseItemMessageMetadata>,
// Do not use directly, no available consistently across all providers.
#[serde(default, skip_serializing_if = "Option::is_none")]
#[ts(optional)]
@@ -3089,50 +3066,29 @@ mod tests {
}
#[test]
fn generates_metadata_uuid_for_message_items() -> Result<()> {
let item = ResponseItem::Message {
id: Some("msg_123".to_string()),
role: "assistant".to_string(),
content: vec![ContentItem::OutputText {
text: "hello".to_string(),
}],
metadata: Some(ResponseItemMetadata {
user_message_type: Some(UserMessageType::Prompt),
uuid: None,
..ResponseItemMetadata::default()
}),
end_turn: None,
phase: None,
};
let surfaced = item.with_generated_metadata_uuid();
let serialized = serde_json::to_value(&surfaced)?;
let metadata = serialized
.get("metadata")
.and_then(serde_json::Value::as_object)
.expect("metadata should be present");
let uuid = metadata
.get("uuid")
fn response_item_message_metadata_serializes_required_metadata_id() -> Result<()> {
let metadata = ResponseItemMessageMetadata::new(Some(UserMessageType::Prompt));
let serialized = serde_json::to_value(&metadata)?;
let metadata = serialized.as_object().expect("metadata should be present");
let metadata_id = metadata
.get("metadata_id")
.and_then(serde_json::Value::as_str)
.expect("uuid should be present");
.expect("metadata_id should be present");
uuid::Uuid::parse_str(uuid).expect("uuid should be valid");
assert_eq!(serialized.get("type"), Some(&serde_json::json!("message")));
assert_eq!(
serialized.get("role"),
Some(&serde_json::json!("assistant"))
);
assert_eq!(
serialized.get("content"),
Some(&serde_json::json!([{ "type": "output_text", "text": "hello" }]))
);
uuid::Uuid::parse_str(metadata_id).expect("metadata_id should be valid");
assert_eq!(
metadata.get("user_message_type"),
Some(&serde_json::json!("prompt"))
);
assert_ne!(uuid, "msg_123");
Ok(())
}
#[test]
fn response_item_message_metadata_new_generates_metadata_id() {
let metadata = ResponseItemMessageMetadata::new(Some(UserMessageType::Prompt));
assert_eq!(metadata.user_message_type, Some(UserMessageType::Prompt));
uuid::Uuid::parse_str(&metadata.metadata_id).expect("metadata_id should be valid");
}
}