mirror of
https://github.com/openai/codex.git
synced 2026-11-15 21:50:46 +00:00
Show file destinations in TUI change approvals (#39285)
## What changed - Show a description and the destination paths affected by each file-change approval. - Include both source and target paths for moves, format cross-platform paths for display, and show `unavailable` when change details are missing. - Recover file changes from buffered events and thread snapshots so live and replayed approvals retain their destination details. ## Testing - Add coverage for active and replayed approvals, moved and cross-platform paths, and the missing-destination fallback. GitOrigin-RevId: 24f90b313fd8643f90cbead1504c788b140d7fed
This commit is contained in:
@@ -0,0 +1,74 @@
|
||||
//! Render file-change approval descriptions and cross-platform destinations.
|
||||
|
||||
use super::approval_overlay::ApplyPatchApprovalRequest;
|
||||
use crate::diff_model::FileChange;
|
||||
use crate::render::renderable::Renderable;
|
||||
use codex_utils_path_uri::LegacyAppPathString;
|
||||
use ratatui::style::Stylize;
|
||||
use ratatui::text::Line;
|
||||
use ratatui::widgets::Paragraph;
|
||||
use ratatui::widgets::Wrap;
|
||||
|
||||
pub(super) fn build_header(request: &ApplyPatchApprovalRequest) -> Box<dyn Renderable> {
|
||||
let mut header = Vec::new();
|
||||
if let Some(thread_label) = &request.thread_label {
|
||||
header.push(Line::from(vec![
|
||||
"Thread: ".into(),
|
||||
thread_label.clone().bold(),
|
||||
]));
|
||||
}
|
||||
|
||||
if !header.is_empty() {
|
||||
header.push(Line::from(""));
|
||||
}
|
||||
|
||||
let description = request
|
||||
.reason
|
||||
.as_deref()
|
||||
.filter(|reason| !reason.is_empty())
|
||||
.unwrap_or("Apply proposed file edits");
|
||||
header.push(Line::from_iter([
|
||||
"Description: ".into(),
|
||||
description.to_string().italic(),
|
||||
]));
|
||||
|
||||
let mut destinations: Vec<_> = request
|
||||
.changes
|
||||
.iter()
|
||||
.flat_map(|(path, change)| {
|
||||
let move_destination = match change {
|
||||
FileChange::Update {
|
||||
move_path: Some(move_path),
|
||||
..
|
||||
} => Some(move_path),
|
||||
FileChange::Add { .. }
|
||||
| FileChange::Delete { .. }
|
||||
| FileChange::Update {
|
||||
move_path: None, ..
|
||||
} => None,
|
||||
};
|
||||
std::iter::once(path).chain(move_destination)
|
||||
})
|
||||
.map(|path| {
|
||||
LegacyAppPathString::from_path(path)
|
||||
.to_inferred_path_uri()
|
||||
.map(|path| path.inferred_native_path_string())
|
||||
.unwrap_or_else(|| request.cwd.join(path).display().to_string())
|
||||
})
|
||||
.collect();
|
||||
destinations.sort();
|
||||
destinations.dedup();
|
||||
if destinations.is_empty() {
|
||||
header.push(Line::from(vec![
|
||||
"Destination: ".into(),
|
||||
"unavailable".bold(),
|
||||
]));
|
||||
}
|
||||
for destination in destinations {
|
||||
header.push(Line::from_iter([
|
||||
"Destination: ".into(),
|
||||
destination.bold(),
|
||||
]));
|
||||
}
|
||||
Box::new(Paragraph::new(header).wrap(Wrap { trim: false }))
|
||||
}
|
||||
Reference in New Issue
Block a user