mirror of
https://github.com/pchuan98/codex.git
synced 2026-07-01 00:31:56 +08:00
6784db51c0
## Why Users have asked for a `/ide` command in the TUI so Codex can use the active IDE session for live context such as the current file, open tabs, and selected ranges. We already support a similar feature in the Codex desktop app, so bringing it to the TUI makes sense. One subtle compatibility constraint is that the injected prompt wrapper and transcript stripping should match the desktop app and IDE extension. By using the same `## My request for Codex:` delimiter and hiding the injected context from transcript rendering the same way, threads created in the TUI render correctly in desktop and IDE surfaces, and threads created there replay correctly in the TUI, even when IDE context was included. Addresses https://github.com/openai/codex/issues/13834. ## What changed ### Summary This PR consists of four four pieces: 1. An IPC client that uses a socket (Mac/Linux) or named pipe (Windows) to talk to the IDE Extension 2. Logic that establishes the IPC connection and requests IDE context (open files, selection) on demand 3. Logic that injects this context into the user prompt (using the same technique as the desktop app) and hides the added context when rendering the prompt in the TUI transcript 4. A new slash command for enabling/disabling this mode and text within the footer to indicate when it's enabled ### Details - Added `/ide [on|off|status]` to the TUI, with bare `/ide` toggling IDE context on or off. - Added a Rust IDE context client that connects to the local Codex IDE IPC route as a client and requests context from the IDE extension flow. - Injected IDE context using the same prompt delimiter and transcript-stripping convention as the desktop app and IDE extension so shared threads render consistently across surfaces. - Added an `IDE context` status-line indicator while the feature is active and cleared it when enabling or fetching context fails. - Added handling for multiple selection ranges, oversized selections, interleaved IPC messages, and transient reconnect timing after quick toggles. ## Verification Did extensive manual testing in addition to running automated unit and regression tests. To test: - Launch VS Code (or Cursor) with the IDE extension. - Open one or more files in the IDE and select a range of text within one of them. - Start the TUI. - Ask the agent which files you have open in your IDE, and it should say that it does not know. - Enable `/ide` mode; note that `IDE context` appears in the lower right. - Ask the agent what files you have open in your IDE and what text is selected.
131 lines
4.7 KiB
Rust
131 lines
4.7 KiB
Rust
//! User-message display models and helpers for the chat widget.
|
|
//!
|
|
//! The app-server preserves user input as structured chunks, while chat history
|
|
//! renders a single prompt row. This module owns that display projection and
|
|
//! the small compare key used to suppress duplicate rows for pending steers.
|
|
|
|
use std::path::PathBuf;
|
|
|
|
use codex_app_server_protocol::UserInput;
|
|
use codex_protocol::user_input::ByteRange;
|
|
use codex_protocol::user_input::TextElement;
|
|
|
|
use super::ChatWidget;
|
|
use super::append_text_with_rebased_elements;
|
|
|
|
#[derive(Clone, Debug, PartialEq)]
|
|
pub(super) struct UserMessageDisplay {
|
|
pub(super) message: String,
|
|
pub(super) remote_image_urls: Vec<String>,
|
|
pub(super) local_images: Vec<PathBuf>,
|
|
pub(super) text_elements: Vec<TextElement>,
|
|
}
|
|
|
|
#[derive(Clone, Debug, PartialEq, Eq)]
|
|
pub(super) struct PendingSteerCompareKey {
|
|
pub(super) message: String,
|
|
pub(super) image_count: usize,
|
|
}
|
|
|
|
impl ChatWidget {
|
|
pub(super) fn user_message_display_from_parts(
|
|
message: String,
|
|
text_elements: Vec<TextElement>,
|
|
local_images: Vec<PathBuf>,
|
|
remote_image_urls: Vec<String>,
|
|
) -> UserMessageDisplay {
|
|
let (message, prompt_request_offset) =
|
|
crate::ide_context::extract_prompt_request_with_offset(&message);
|
|
let prompt_request_end = prompt_request_offset + message.len();
|
|
// Prompt context uses the same delimiter and stripping behavior as the desktop app and IDE
|
|
// extension. The raw user message goes to the agent, but every surface renders only the
|
|
// request after that delimiter, so keep elements inside the visible request and shift their
|
|
// byte ranges to match.
|
|
let text_elements = text_elements
|
|
.into_iter()
|
|
.filter_map(|element| {
|
|
let range = element.byte_range;
|
|
if range.start < prompt_request_offset || range.end > prompt_request_end {
|
|
return None;
|
|
}
|
|
|
|
Some(element.map_range(|range| ByteRange {
|
|
start: range.start - prompt_request_offset,
|
|
end: range.end - prompt_request_offset,
|
|
}))
|
|
})
|
|
.collect();
|
|
|
|
UserMessageDisplay {
|
|
message: message.to_string(),
|
|
remote_image_urls,
|
|
local_images,
|
|
text_elements,
|
|
}
|
|
}
|
|
|
|
/// Build the compare key for a submitted pending steer without invoking the
|
|
/// expensive request-serialization path. Pending steers only need to match the
|
|
/// committed app-server `UserMessage` item emitted after input drains, which
|
|
/// preserves flattened text and total image count.
|
|
pub(super) fn pending_steer_compare_key_from_items(
|
|
items: &[UserInput],
|
|
) -> PendingSteerCompareKey {
|
|
let mut message = String::new();
|
|
let mut image_count = 0;
|
|
|
|
for item in items {
|
|
match item {
|
|
UserInput::Text { text, .. } => message.push_str(text),
|
|
UserInput::Image { .. } | UserInput::LocalImage { .. } => image_count += 1,
|
|
UserInput::Skill { .. } | UserInput::Mention { .. } => {}
|
|
}
|
|
}
|
|
|
|
PendingSteerCompareKey {
|
|
message,
|
|
image_count,
|
|
}
|
|
}
|
|
|
|
pub(super) fn user_message_display_from_inputs(items: &[UserInput]) -> UserMessageDisplay {
|
|
let mut message = String::new();
|
|
let mut remote_image_urls = Vec::new();
|
|
let mut local_images = Vec::new();
|
|
let mut text_elements = Vec::new();
|
|
|
|
for item in items {
|
|
match item {
|
|
UserInput::Text {
|
|
text,
|
|
text_elements: current_text_elements,
|
|
} => append_text_with_rebased_elements(
|
|
&mut message,
|
|
&mut text_elements,
|
|
text,
|
|
current_text_elements.iter().map(|element| {
|
|
let range = element.byte_range.clone();
|
|
TextElement::new(
|
|
range.clone().into(),
|
|
element
|
|
.placeholder()
|
|
.or_else(|| text.get(range.start..range.end))
|
|
.map(str::to_string),
|
|
)
|
|
}),
|
|
),
|
|
UserInput::Image { url } => remote_image_urls.push(url.clone()),
|
|
UserInput::LocalImage { path } => local_images.push(path.clone()),
|
|
UserInput::Skill { .. } | UserInput::Mention { .. } => {}
|
|
}
|
|
}
|
|
|
|
Self::user_message_display_from_parts(
|
|
message,
|
|
text_elements,
|
|
local_images,
|
|
remote_image_urls,
|
|
)
|
|
}
|
|
}
|