Skip to content

[codex] remove plain image wrapper spans #24652

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pakrym-oai merged 1 commit into from
May 26, 2026
Merged

[codex] remove plain image wrapper spans #24652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions codex-rs/core/tests/suite/image_rollout.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,16 +257,10 @@ async fn drag_drop_image_persists_rollout_request_shape() -> anyhow::Result<()>
id: None,
role: "user".to_string(),
content: vec![
ContentItem::InputText {
text: codex_protocol::models::image_open_tag_text(),
},
ContentItem::InputImage {
image_url,
detail: Some(DEFAULT_IMAGE_DETAIL),
},
ContentItem::InputText {
text: codex_protocol::models::image_close_tag_text(),
},
ContentItem::InputText {
text: "dropped image".to_string(),
},
Expand Down
13 changes: 0 additions & 13 deletions codex-rs/core/tests/suite/model_switching.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,19 +555,6 @@ async fn model_change_from_image_to_text_strips_prior_image_content() -> Result<
.any(|text| text == "image content omitted because you do not support image input"),
"second request should include the image-omitted placeholder text"
);
assert!(
second_user_texts
.iter()
.any(|text| text == &codex_protocol::models::image_open_tag_text()),
"second request should preserve the image open tag text"
);
assert!(
second_user_texts
.iter()
.any(|text| text == &codex_protocol::models::image_close_tag_text()),
"second request should preserve the image close tag text"
);

Ok(())
}

Expand Down
8 changes: 3 additions & 5 deletions ...s/suite/snapshots/all__suite__compact__pre_turn_compaction_including_incoming_shapes.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ Scenario: Pre-turn auto-compaction with a context override emits the context dif
02:message/user:<COMPACTION_SUMMARY>\nPRE_TURN_SUMMARY
03:message/developer:<PERMISSIONS_INSTRUCTIONS>
04:message/user:<ENVIRONMENT_CONTEXT:cwd=PRETURN_CONTEXT_DIFF_CWD>
05:message/user[4]:
[01] <image>
[02] <input_image:detail,image_url>
[03] </image>
[04] USER_THREE
05:message/user[2]:
[01] <input_image:detail,image_url>
[02] USER_THREE
54 changes: 13 additions & 41 deletions codex-rs/protocol/src/models.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1238,18 +1238,10 @@ impl From<Vec<UserInput>> for ResponseInputItem {
UserInput::Image { image_url, detail } => {
image_index += 1;
let detail = detail.unwrap_or(DEFAULT_IMAGE_DETAIL);
vec![
ContentItem::InputText {
text: image_open_tag_text(),
},
ContentItem::InputImage {
image_url,
detail: Some(detail),
},
ContentItem::InputText {
text: image_close_tag_text(),
},
]
vec![ContentItem::InputImage {
image_url,
detail: Some(detail),
}]
}
UserInput::LocalImage { path, detail } => {
image_index += 1;
Expand Down Expand Up @@ -2622,7 +2614,7 @@ mod tests {
}

#[test]
fn wraps_image_user_input_with_tags() -> Result<()> {
fn serializes_image_user_input_without_tags() -> Result<()> {
let image_url = "data:image/png;base64,abc".to_string();

let item = ResponseInputItem::from(vec![UserInput::Image {
Expand All @@ -2632,18 +2624,10 @@ mod tests {

match item {
ResponseInputItem::Message { content, .. } => {
let expected = vec![
ContentItem::InputText {
text: image_open_tag_text(),
},
ContentItem::InputImage {
image_url,
detail: Some(DEFAULT_IMAGE_DETAIL),
},
ContentItem::InputText {
text: image_close_tag_text(),
},
];
let expected = vec![ContentItem::InputImage {
image_url,
detail: Some(DEFAULT_IMAGE_DETAIL),
}];
assert_eq!(content, expected);
}
other => panic!("expected message response but got {other:?}"),
Expand All @@ -2664,7 +2648,7 @@ mod tests {
match item {
ResponseInputItem::Message { content, .. } => {
assert_eq!(
content.get(1),
content.first(),
Some(&ContentItem::InputImage {
image_url,
detail: Some(ImageDetail::Original),
Expand Down Expand Up @@ -2862,35 +2846,23 @@ mod tests {
ResponseInputItem::Message { content, .. } => {
assert_eq!(
content.first(),
Some(&ContentItem::InputText {
text: image_open_tag_text(),
})
);
assert_eq!(
content.get(1),
Some(&ContentItem::InputImage {
image_url,
detail: Some(DEFAULT_IMAGE_DETAIL),
})
);
assert_eq!(
content.get(2),
Some(&ContentItem::InputText {
text: image_close_tag_text(),
})
);
assert_eq!(
content.get(3),
content.get(1),
Some(&ContentItem::InputText {
text: local_image_open_tag_text(/*label_number*/ 2),
})
);
assert!(matches!(
content.get(4),
content.get(2),
Some(ContentItem::InputImage { .. })
));
assert_eq!(
content.get(5),
content.get(3),
Some(&ContentItem::InputText {
text: image_close_tag_text(),
})
Expand Down
Loading