mirror of
https://github.com/openai/codex.git
synced 2026-09-10 20:26:47 +00:00
4582c0a498
## What changed - Preserve each contextual fragment's `ContentItemKind` when converting it to a response message. - Classify user text, image, and audio content as `user.text`, `user.image`, and `user.audio` in their original order. - Give additional context key-specific `additional_content.<key>` kinds and retain annotations on generated messages such as image resize notices and interrupted-turn markers. ## Testing - Expand request-level coverage to verify content-kind annotations across mixed-modality turns, additional context, reminders, budgets, skills, model switching, subagents, and image resizing. GitOrigin-RevId: 671e4545f39b335525c60d2a5df4608e8068cafc
103 lines
2.8 KiB
Rust
103 lines
2.8 KiB
Rust
use codex_protocol::models::ContentItemKind;
|
|
use codex_utils_string::truncate_middle_with_token_budget;
|
|
|
|
use crate::ContextualUserFragment;
|
|
|
|
const MAX_ADDITIONAL_CONTEXT_VALUE_TOKENS: usize = 1_000;
|
|
const ADDITIONAL_CONTEXT_END_MARKER_SUFFIX: &str = ">";
|
|
const ADDITIONAL_CONTEXT_START_MARKER_PREFIX: &str = "<external_";
|
|
|
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
|
pub struct AdditionalContextUserFragment {
|
|
key: String,
|
|
value: String,
|
|
}
|
|
|
|
impl AdditionalContextUserFragment {
|
|
pub fn new(key: String, value: String) -> Self {
|
|
Self { key, value }
|
|
}
|
|
}
|
|
|
|
impl ContextualUserFragment for AdditionalContextUserFragment {
|
|
fn role(&self) -> &'static str {
|
|
"user"
|
|
}
|
|
|
|
fn content_kind(&self) -> ContentItemKind {
|
|
ContentItemKind(format!("additional_content.{}", self.key))
|
|
}
|
|
|
|
fn markers(&self) -> (&'static str, &'static str) {
|
|
Self::type_markers()
|
|
}
|
|
|
|
fn type_markers() -> (&'static str, &'static str) {
|
|
(
|
|
ADDITIONAL_CONTEXT_START_MARKER_PREFIX,
|
|
ADDITIONAL_CONTEXT_END_MARKER_SUFFIX,
|
|
)
|
|
}
|
|
|
|
fn matches_text(text: &str) -> bool {
|
|
let trimmed = text.trim();
|
|
let Some(rest) = trimmed.strip_prefix(ADDITIONAL_CONTEXT_START_MARKER_PREFIX) else {
|
|
return false;
|
|
};
|
|
let Some((key, value_and_close)) = rest.split_once(ADDITIONAL_CONTEXT_END_MARKER_SUFFIX)
|
|
else {
|
|
return false;
|
|
};
|
|
|
|
value_and_close.ends_with(&format!("</external_{key}>"))
|
|
}
|
|
|
|
fn body(&self) -> String {
|
|
additional_context_body(&self.key, &self.value)
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
|
pub struct AdditionalContextDeveloperFragment {
|
|
key: String,
|
|
value: String,
|
|
}
|
|
|
|
impl AdditionalContextDeveloperFragment {
|
|
pub fn new(key: String, value: String) -> Self {
|
|
Self { key, value }
|
|
}
|
|
}
|
|
|
|
impl ContextualUserFragment for AdditionalContextDeveloperFragment {
|
|
fn role(&self) -> &'static str {
|
|
"developer"
|
|
}
|
|
|
|
fn content_kind(&self) -> ContentItemKind {
|
|
ContentItemKind(format!("additional_content.{}", self.key))
|
|
}
|
|
|
|
fn markers(&self) -> (&'static str, &'static str) {
|
|
Self::type_markers()
|
|
}
|
|
|
|
fn type_markers() -> (&'static str, &'static str) {
|
|
("", "")
|
|
}
|
|
|
|
fn body(&self) -> String {
|
|
additional_context_developer_body(&self.key, &self.value)
|
|
}
|
|
}
|
|
|
|
fn additional_context_body(key: &str, value: &str) -> String {
|
|
let value = truncate_middle_with_token_budget(value, MAX_ADDITIONAL_CONTEXT_VALUE_TOKENS).0;
|
|
format!("{key}>{value}</external_{key}")
|
|
}
|
|
|
|
fn additional_context_developer_body(key: &str, value: &str) -> String {
|
|
let value = truncate_middle_with_token_budget(value, MAX_ADDITIONAL_CONTEXT_VALUE_TOKENS).0;
|
|
format!("<{key}>{value}</{key}>")
|
|
}
|