mirror of
https://github.com/openai/codex.git
synced 2026-09-20 12:47:38 +00:00
## What changed - Accept `fileId` alongside the existing `url` form for app-server image inputs, and forward file references to the Responses API as `file_id`. Update generated schemas and client types. - Preserve file references, image detail hints, and mixed inline/file image ordering through user-message events, thread history, and rollout migration. Retain file images when truncating tool output. - Pass file references through image preparation without resolving them, while keeping resize-notice numbering correct. Omit them from unsupported TUI display and Guardian image context. - Reject image-edit requests whose recent-image window includes a file reference, preventing selection of an older inline image instead. ## Testing Add coverage for serialization, request and rollout preservation, mixed-image history ordering, incomplete ordering metadata, tool-output truncation, and rejection of unsupported image-edit selections. GitOrigin-RevId: 6ca20a8577155cc934b720803c3b7b3bffdf972a
127 lines
4.2 KiB
Rust
127 lines
4.2 KiB
Rust
use schemars::JsonSchema;
|
|
use serde::Deserialize;
|
|
use serde::Serialize;
|
|
use ts_rs::TS;
|
|
|
|
use crate::models::ImageDetail;
|
|
use crate::models::ImageReference;
|
|
|
|
/// Conservative cap so one user message cannot monopolize a large context window.
|
|
pub const MAX_USER_INPUT_TEXT_CHARS: usize = 1 << 20;
|
|
|
|
/// User input
|
|
#[non_exhaustive]
|
|
#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, TS, JsonSchema)]
|
|
#[serde(tag = "type", rename_all = "snake_case")]
|
|
pub enum UserInput {
|
|
Text {
|
|
text: String,
|
|
/// UI-defined spans within `text` that should be treated as special elements.
|
|
/// These are byte ranges into the UTF-8 `text` buffer and are used to render
|
|
/// or persist rich input markers (e.g., image placeholders) across history
|
|
/// and resume without mutating the literal text.
|
|
#[serde(default)]
|
|
text_elements: Vec<TextElement>,
|
|
},
|
|
/// Image reference forwarded to the Responses API.
|
|
Image {
|
|
#[serde(flatten)]
|
|
image: ImageReference,
|
|
#[serde(default, skip_serializing_if = "Option::is_none")]
|
|
#[ts(optional)]
|
|
detail: Option<ImageDetail>,
|
|
},
|
|
/// Local image path provided by the user. This will be converted to an
|
|
/// `Image` variant (base64 data URL) during request serialization.
|
|
LocalImage {
|
|
path: std::path::PathBuf,
|
|
#[serde(default, skip_serializing_if = "Option::is_none")]
|
|
#[ts(optional)]
|
|
detail: Option<ImageDetail>,
|
|
},
|
|
/// Pre-encoded audio data URI forwarded to the Responses API.
|
|
Audio { audio_url: String },
|
|
/// Local audio path converted to an `Audio` data URI during request serialization.
|
|
LocalAudio { path: std::path::PathBuf },
|
|
|
|
/// Skill selected by the user (name + path to SKILL.md).
|
|
Skill {
|
|
name: String,
|
|
path: std::path::PathBuf,
|
|
},
|
|
/// Explicit structured mention selected by the user.
|
|
///
|
|
/// `path` identifies the exact mention target, for example
|
|
/// `app://<connector-id>` or `plugin://<plugin-name>@<marketplace-name>`.
|
|
Mention { name: String, path: String },
|
|
}
|
|
|
|
#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, TS, JsonSchema)]
|
|
pub struct TextElement {
|
|
/// Byte range in the parent `text` buffer that this element occupies.
|
|
pub byte_range: ByteRange,
|
|
/// Optional human-readable placeholder for the element, displayed in the UI.
|
|
placeholder: Option<String>,
|
|
}
|
|
|
|
impl TextElement {
|
|
pub fn new(byte_range: ByteRange, placeholder: Option<String>) -> Self {
|
|
Self {
|
|
byte_range,
|
|
placeholder,
|
|
}
|
|
}
|
|
|
|
/// Returns a copy of this element with a remapped byte range.
|
|
///
|
|
/// The placeholder is preserved as-is; callers must ensure the new range
|
|
/// still refers to the same logical element (and same placeholder)
|
|
/// within the new text.
|
|
pub fn map_range<F>(&self, map: F) -> Self
|
|
where
|
|
F: FnOnce(ByteRange) -> ByteRange,
|
|
{
|
|
Self {
|
|
byte_range: map(self.byte_range),
|
|
placeholder: self.placeholder.clone(),
|
|
}
|
|
}
|
|
|
|
pub fn set_placeholder(&mut self, placeholder: Option<String>) {
|
|
self.placeholder = placeholder;
|
|
}
|
|
|
|
/// Returns the stored placeholder without falling back to the text buffer.
|
|
///
|
|
/// This must only be used inside `From<TextElement>` implementations on equivalent
|
|
/// protocol types where the source text is unavailable. Prefer `placeholder(text)`
|
|
/// everywhere else.
|
|
#[doc(hidden)]
|
|
pub fn _placeholder_for_conversion_only(&self) -> Option<&str> {
|
|
self.placeholder.as_deref()
|
|
}
|
|
|
|
pub fn placeholder<'a>(&'a self, text: &'a str) -> Option<&'a str> {
|
|
self.placeholder
|
|
.as_deref()
|
|
.or_else(|| text.get(self.byte_range.start..self.byte_range.end))
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Clone, Copy, Deserialize, Serialize, PartialEq, Eq, TS, JsonSchema)]
|
|
pub struct ByteRange {
|
|
/// Start byte offset (inclusive) within the UTF-8 text buffer.
|
|
pub start: usize,
|
|
/// End byte offset (exclusive) within the UTF-8 text buffer.
|
|
pub end: usize,
|
|
}
|
|
|
|
impl From<std::ops::Range<usize>> for ByteRange {
|
|
fn from(range: std::ops::Range<usize>) -> Self {
|
|
Self {
|
|
start: range.start,
|
|
end: range.end,
|
|
}
|
|
}
|
|
}
|