mirror of
https://github.com/openai/codex.git
synced 2026-11-18 23:02:23 +00:00
Require prefixes for outbound response item IDs (#32312)
## What changed - Add a `ResponseItemId` type that generates item-specific prefixes with UUIDv7 suffixes and use it across response items. - Keep deserialization permissive for legacy histories, but omit empty or unprefixed item IDs from HTTP and WebSocket requests. - Export the new type in the generated TypeScript protocol schema. ## Testing - Cover prefixed ID generation, legacy deserialization, prefix recognition, and outbound request filtering. GitOrigin-RevId: 0209fe430c826d0ae88bc4648652c4ebf390c4a4
This commit is contained in:
1 parent
08ba14b03d
commit
c9d52de5ca
38 files changed
+430
-160
No files matched your search
@@ -121,7 +121,7 @@ fn parse_user_message(message: &[ContentItem]) -> Option<UserMessageItem> {
|
||||
}
|
||||
|
||||
fn parse_agent_message(
|
||||
id: Option<&String>,
|
||||
id: Option<&str>,
|
||||
message: &[ContentItem],
|
||||
phase: Option<MessagePhase>,
|
||||
) -> AgentMessageItem {
|
||||
@@ -139,7 +139,9 @@ fn parse_agent_message(
|
||||
}
|
||||
}
|
||||
}
|
||||
let id = id.cloned().unwrap_or_else(|| Uuid::new_v4().to_string());
|
||||
let id = id
|
||||
.map(str::to_string)
|
||||
.unwrap_or_else(|| Uuid::new_v4().to_string());
|
||||
AgentMessageItem {
|
||||
id,
|
||||
content,
|
||||
@@ -157,11 +159,11 @@ pub fn parse_turn_item(item: &ResponseItem) -> Option<TurnItem> {
|
||||
phase,
|
||||
..
|
||||
} => match role.as_str() {
|
||||
"user" => parse_visible_hook_prompt_message(id.as_ref(), content)
|
||||
"user" => parse_visible_hook_prompt_message(id.as_deref(), content)
|
||||
.map(TurnItem::HookPrompt)
|
||||
.or_else(|| parse_user_message(content).map(TurnItem::UserMessage)),
|
||||
"assistant" => Some(TurnItem::AgentMessage(parse_agent_message(
|
||||
id.as_ref(),
|
||||
id.as_deref(),
|
||||
content,
|
||||
phase.clone(),
|
||||
))),
|
||||
@@ -190,7 +192,7 @@ pub fn parse_turn_item(item: &ResponseItem) -> Option<TurnItem> {
|
||||
})
|
||||
.collect();
|
||||
Some(TurnItem::Reasoning(ReasoningItem {
|
||||
id: id.clone().unwrap_or_default(),
|
||||
id: id.as_deref().unwrap_or_default().to_string(),
|
||||
summary_text,
|
||||
raw_content,
|
||||
}))
|
||||
@@ -201,7 +203,7 @@ pub fn parse_turn_item(item: &ResponseItem) -> Option<TurnItem> {
|
||||
None => (WebSearchAction::Other, String::new()),
|
||||
};
|
||||
Some(TurnItem::WebSearch(WebSearchItem {
|
||||
id: id.clone().unwrap_or_default(),
|
||||
id: id.as_deref().unwrap_or_default().to_string(),
|
||||
query,
|
||||
action,
|
||||
}))
|
||||
@@ -214,7 +216,7 @@ pub fn parse_turn_item(item: &ResponseItem) -> Option<TurnItem> {
|
||||
..
|
||||
} => Some(TurnItem::ImageGeneration(
|
||||
codex_protocol::items::ImageGenerationItem {
|
||||
id: id.clone()?,
|
||||
id: id.as_deref()?.to_string(),
|
||||
status: status.clone(),
|
||||
revised_prompt: revised_prompt.clone(),
|
||||
result: result.clone(),
|
||||
|
||||
Reference in new issue
Block a user