Extract user input preparation into codex-user-input (#61949)

## What changed

Move local attachment snapshotting and conversion from `UserInput` to model request content out of `codex-protocol` into a dedicated `codex-user-input` crate. Update core, the TUI, and the queue extension to use the new crate, replacing the `ResponseInputItem` conversion methods with `from_user_input`.

Move the associated attachment and message conversion tests alongside the implementation, preserving coverage for image positions, media labels, serialization, and error placeholders.

GitOrigin-RevId: 77d0f94a4cd4c2edc008b9e2e63a989995aab058
This commit is contained in:
Adam Perry @ OpenAI
2026-11-17 02:43:52 +00:00
committed by copyberry
parent ad161203cb
commit 5b3d2c7fce
24 changed files with 814 additions and 723 deletions
@@ -4,8 +4,8 @@
use super::*;
use crate::context_manager::ContextManager;
use codex_protocol::models::BaseInstructions;
use codex_protocol::models::ContentItem;
use codex_protocol::models::ResponseInputItem;
use codex_protocol::user_input::UserInput;
use codex_protocol_test_support::uuid_v7_item_id_generator_for_test;
use codex_utils_output_truncation::TruncationPolicy;
use pretty_assertions::assert_eq;
@@ -13,15 +13,17 @@ use pretty_assertions::assert_eq;
#[test]
fn history_sums_measured_and_unknown_file_audio() {
let mut history = ContextManager::new(uuid_v7_item_id_generator_for_test());
let item = ResponseInputItem::from(
["short", "unknown"]
.map(|file_id| UserInput::Audio {
let item = ResponseInputItem::Message {
role: "user".to_string(),
content: ["short", "unknown"]
.map(|file_id| ContentItem::InputAudio {
audio: AudioReference::File {
file_id: file_id.into(),
},
})
.to_vec(),
);
.into(),
phase: None,
};
history.record_items(
[&ResponseItem::from(item)],
TruncationPolicy::Tokens(10_000),
+3 -3
View File
@@ -390,8 +390,6 @@ use codex_protocol::config_types::Settings;
use codex_protocol::config_types::WindowsSandboxLevel;
use codex_protocol::mcp::ClientMcpExtensions;
use codex_protocol::mcp::OPENAI_STANDARD_FORM_INPUT_EXTENSION_ID;
use codex_protocol::models::LocalImagePreparation;
use codex_protocol::models::ResponseInputItem;
use codex_protocol::models::ResponseItem;
use codex_protocol::openai_models::ReasoningEffort as ReasoningEffortConfig;
use codex_protocol::protocol::ApplyPatchApprovalRequestEvent;
@@ -430,6 +428,8 @@ use codex_protocol::turn_input::TurnStartOptions;
use codex_protocol::user_input::UserInput;
use codex_skills_extension::HostSkillsService;
use codex_tools::ToolName;
use codex_user_input::LocalImagePreparation;
use codex_user_input::from_user_input;
use codex_utils_absolute_path::AbsolutePathBuf;
#[cfg(test)]
use codex_utils_stream_parser::ProposedPlanSegment;
@@ -4016,7 +4016,7 @@ impl Session {
input: Vec<UserInput>,
user_image_content_indices: &mut HashMap<usize, usize>,
) -> ResponseItem {
let mut item = ResponseItem::from(ResponseInputItem::from_user_input(
let mut item = ResponseItem::from(from_user_input(
input,
LocalImagePreparation::Defer,
user_image_content_indices,
@@ -4,6 +4,7 @@ use super::*;
use crate::McpRefreshReason;
use codex_mcp::McpResourceClient;
use codex_mcp::McpResourceClientCacheKey;
use codex_protocol::models::ResponseInputItem;
use pretty_assertions::assert_eq;
struct Recorder {