Skip to content

armgit / codex

Public Imported from GitHub
0

Lightweight coding agent that runs in your terminal

Rust

Extract shared TUI user prompt helpers from IDE context (#55597)

Benjamin Carlsson78d4c7c7fae2
diff --git a/codex-rs/tui/src/app/thread_routing.rs b/codex-rs/tui/src/app/thread_routing.rs
index 2ace03d211..07a986931b 100644
--- a/codex-rs/tui/src/app/thread_routing.rs
+++ b/codex-rs/tui/src/app/thread_routing.rs
@@ -2053,7 +2053,7 @@ impl App {
.iter()
.filter_map(|item| match item {
codex_app_server_protocol::UserInput::Text { text, .. } => {
- Some(crate::ide_context::extract_prompt_request_with_offset(text).0)
+ Some(crate::user_prompt::extract_prompt_request_with_offset(text).0)
}
_ => None,
})
diff --git a/codex-rs/tui/src/app/thread_title.rs b/codex-rs/tui/src/app/thread_title.rs
index 5b683418b2..e248dde09b 100644
--- a/codex-rs/tui/src/app/thread_title.rs
+++ b/codex-rs/tui/src/app/thread_title.rs
@@ -305,7 +305,7 @@ where
.iter()
.filter_map(|input| match input {
UserInput::Text { text, .. } => {
- Some(crate::ide_context::extract_prompt_request_with_offset(text).0)
+ Some(crate::user_prompt::extract_prompt_request_with_offset(text).0)
}
_ => None,
})
diff --git a/codex-rs/tui/src/app/transcript_export.rs b/codex-rs/tui/src/app/transcript_export.rs
index cb1fe1bc99..273ecee194 100644
--- a/codex-rs/tui/src/app/transcript_export.rs
+++ b/codex-rs/tui/src/app/transcript_export.rs
@@ -229,7 +229,7 @@ fn render_markdown_transcript(cells: &[Arc<dyn HistoryCell>]) -> Result<String,
for cell in cells {
let lines = if let Some(user) = cell.as_any().downcast_ref::<UserHistoryCell>() {
let (message, _) =
- crate::ide_context::extract_prompt_request_with_offset(&user.message);
+ crate::user_prompt::extract_prompt_request_with_offset(&user.message);
let message = crate::history_cell::sanitize_user_text(message.into());
let mut lines = raw_lines_from_source(&message);
let image_count = user.local_image_paths.len() + user.remote_image_urls.len();
diff --git a/codex-rs/tui/src/chatwidget/user_messages.rs b/codex-rs/tui/src/chatwidget/user_messages.rs
index 401c2a5318..864760984b 100644
--- a/codex-rs/tui/src/chatwidget/user_messages.rs
+++ b/codex-rs/tui/src/chatwidget/user_messages.rs
@@ -716,7 +716,7 @@ impl ChatWidget {
.collect();
let reply_text = crate::async_question_reply::display_text(&message);
let (message, prompt_request_offset) =
- crate::ide_context::extract_prompt_request_with_offset(&message);
+ crate::user_prompt::extract_prompt_request_with_offset(&message);
if let Some(message) =
reply_text.or_else(|| crate::async_question_reply::display_text(message))
{
diff --git a/codex-rs/tui/src/ide_context.rs b/codex-rs/tui/src/ide_context.rs
index 9701b5ad85..cb3609f319 100644
--- a/codex-rs/tui/src/ide_context.rs
+++ b/codex-rs/tui/src/ide_context.rs
@@ -7,7 +7,6 @@ mod windows_pipe;
pub(crate) use ipc::fetch_ide_context;
pub(crate) use prompt::apply_ide_context_to_user_input;
-pub(crate) use prompt::extract_prompt_request_with_offset;
pub(crate) use prompt::has_prompt_context;
use serde::Deserialize;
diff --git a/codex-rs/tui/src/ide_context/prompt.rs b/codex-rs/tui/src/ide_context/prompt.rs
index f7dc5f466c..751a406dbf 100644
--- a/codex-rs/tui/src/ide_context/prompt.rs
+++ b/codex-rs/tui/src/ide_context/prompt.rs
@@ -1,7 +1,5 @@
//! Prompt rendering for IDE context injected into TUI user turns.
-use codex_app_server_protocol::ByteRange;
-use codex_app_server_protocol::TextElement;
use codex_app_server_protocol::UserInput;
use super::IdeContext;
@@ -9,11 +7,6 @@ use super::IdeContext;
const MAX_ACTIVE_SELECTION_CHARS: usize = 40_000;
const MAX_OPEN_TABS: usize = 100;
const MAX_OPEN_TABS_CHARS: usize = 20_000;
-// Match the desktop app and IDE extension delimiter exactly. IDE context is serialized into the
-// raw prompt before this marker, then transcript rendering strips back to the request after the last
-// marker. Keeping the same marker and stripping semantics lets threads created with IDE context in
-// one surface replay cleanly in the others.
-const PROMPT_REQUEST_BEGIN: &str = "## My request for Codex:";
pub(crate) fn apply_ide_context_to_user_input(
context: &IdeContext,
@@ -22,39 +15,7 @@ pub(crate) fn apply_ide_context_to_user_input(
let Some(context_text) = render_prompt_context(context) else {
return false;
};
-
- let prefix = format!("{context_text}\n{PROMPT_REQUEST_BEGIN}\n");
- if let Some(text_index) = items
- .iter()
- .position(|item| matches!(item, UserInput::Text { .. }))
- {
- // Prefix the existing text item in place so image and text items keep
- // the same relative order they had in the user's original submission.
- let item = std::mem::replace(
- &mut items[text_index],
- UserInput::Text {
- text: String::new(),
- text_elements: Vec::new(),
- },
- );
- let UserInput::Text {
- text,
- text_elements,
- } = item
- else {
- unreachable!("position matched a text item");
- };
- items[text_index] = prefixed_text_input(prefix, text, text_elements);
- } else {
- items.insert(
- 0,
- UserInput::Text {
- text: prefix,
- text_elements: Vec::new(),
- },
- );
- }
-
+ crate::user_prompt::apply_prompt_context_to_user_input(&context_text, items);
true
}
@@ -62,37 +23,6 @@ pub(crate) fn has_prompt_context(context: &IdeContext) -> bool {
render_prompt_context(context).is_some()
}
-pub(crate) fn extract_prompt_request_with_offset(message: &str) -> (&str, usize) {
- let Some((before_request, request)) = message.rsplit_once(PROMPT_REQUEST_BEGIN) else {
- return (message, 0);
- };
-
- let request_start = before_request.len() + PROMPT_REQUEST_BEGIN.len();
- let trimmed_request = request.trim();
- let leading_trimmed_len = request.len() - request.trim_start().len();
- (trimmed_request, request_start + leading_trimmed_len)
-}
-
-fn prefixed_text_input(prefix: String, text: String, text_elements: Vec<TextElement>) -> UserInput {
- let prefix_len = prefix.len();
- UserInput::Text {
- text: format!("{prefix}{text}"),
- text_elements: text_elements
- .into_iter()
- .map(|element| {
- let range = element.byte_range.clone();
- TextElement::new(
- ByteRange {
- start: range.start + prefix_len,
- end: range.end + prefix_len,
- },
- element.placeholder().map(str::to_string),
- )
- })
- .collect(),
- }
-}
-
fn render_prompt_context(context: &IdeContext) -> Option<String> {
let mut ide_context_section = String::new();
@@ -192,6 +122,8 @@ mod tests {
use super::super::Position;
use super::super::Range;
use super::*;
+ use codex_app_server_protocol::ByteRange;
+ use codex_app_server_protocol::TextElement;
use codex_protocol_test_support::ContentItemTestExt;
use pretty_assertions::assert_eq;
use std::path::PathBuf;
@@ -353,17 +285,6 @@ mod tests {
);
}
- #[test]
- fn extract_prompt_request_returns_text_after_last_delimiter() {
- let message =
- "# Context\n## My request for Codex:\nFirst\n## My request for Codex:\n Second\n";
-
- assert_eq!(
- extract_prompt_request_with_offset(message),
- ("Second", message.find("Second").expect("request offset"))
- );
- }
-
#[test]
fn render_prompt_context_includes_selection_ranges_without_content() {
let first_range = Range {
diff --git a/codex-rs/tui/src/lib.rs b/codex-rs/tui/src/lib.rs
index 7780b168be..8b2862c76e 100644
--- a/codex-rs/tui/src/lib.rs
+++ b/codex-rs/tui/src/lib.rs
@@ -261,6 +261,7 @@ mod update_versions;
mod updates;
#[cfg(any(not(debug_assertions), test))]
mod updates_cache;
+mod user_prompt;
mod version;
mod vim_search;
mod width;
diff --git a/codex-rs/tui/src/user_prompt.rs b/codex-rs/tui/src/user_prompt.rs
new file mode 100644
index 0000000000..109d2d34b0
--- /dev/null
+++ b/codex-rs/tui/src/user_prompt.rs
@@ -0,0 +1,77 @@
+//! Combines model-visible context with the user request while preserving transcript rendering.
+
+use codex_app_server_protocol::ByteRange;
+use codex_app_server_protocol::TextElement;
+use codex_app_server_protocol::UserInput;
+
+// Context precedes this delimiter so transcript rendering across Codex surfaces can show the user's request.
+const PROMPT_REQUEST_BEGIN: &str = "## My request for Codex:";
+
+pub(crate) fn apply_prompt_context_to_user_input(context_text: &str, items: &mut Vec<UserInput>) {
+ let prefix = format!("{context_text}\n{PROMPT_REQUEST_BEGIN}\n");
+ if let Some(text_index) = items
+ .iter()
+ .position(|item| matches!(item, UserInput::Text { .. }))
+ {
+ // Prefix the existing text item in place so image and text items keep
+ // the same relative order they had in the user's original submission.
+ let item = std::mem::replace(
+ &mut items[text_index],
+ UserInput::Text {
+ text: String::new(),
+ text_elements: Vec::new(),
+ },
+ );
+ let UserInput::Text {
+ text,
+ text_elements,
+ } = item
+ else {
+ unreachable!("position matched a text item");
+ };
+ items[text_index] = prefixed_text_input(prefix, text, text_elements);
+ } else {
+ items.insert(
+ 0,
+ UserInput::Text {
+ text: prefix,
+ text_elements: Vec::new(),
+ },
+ );
+ }
+}
+
+pub(crate) fn extract_prompt_request_with_offset(message: &str) -> (&str, usize) {
+ let Some((before_request, request)) = message.rsplit_once(PROMPT_REQUEST_BEGIN) else {
+ return (message, 0);
+ };
+
+ let request_start = before_request.len() + PROMPT_REQUEST_BEGIN.len();
+ let trimmed_request = request.trim();
+ let leading_trimmed_len = request.len() - request.trim_start().len();
+ (trimmed_request, request_start + leading_trimmed_len)
+}
+
+fn prefixed_text_input(prefix: String, text: String, text_elements: Vec<TextElement>) -> UserInput {
+ let prefix_len = prefix.len();
+ UserInput::Text {
+ text: format!("{prefix}{text}"),
+ text_elements: text_elements
+ .into_iter()
+ .map(|element| {
+ let range = element.byte_range.clone();
+ TextElement::new(
+ ByteRange {
+ start: range.start + prefix_len,
+ end: range.end + prefix_len,
+ },
+ element.placeholder().map(str::to_string),
+ )
+ })
+ .collect(),
+ }
+}
+
+#[cfg(test)]
+#[path = "user_prompt_tests.rs"]
+mod tests;
diff --git a/codex-rs/tui/src/user_prompt_tests.rs b/codex-rs/tui/src/user_prompt_tests.rs
new file mode 100644
index 0000000000..41bfe30b53
--- /dev/null
+++ b/codex-rs/tui/src/user_prompt_tests.rs
@@ -0,0 +1,13 @@
+use super::extract_prompt_request_with_offset;
+use pretty_assertions::assert_eq;
+
+#[test]
+fn extract_prompt_request_returns_text_after_last_delimiter() {
+ let message =
+ "# Context\n## My request for Codex:\nFirst\n## My request for Codex:\n Second\n";
+
+ assert_eq!(
+ extract_prompt_request_with_offset(message),
+ ("Second", message.find("Second").expect("request offset"))
+ );
+}