mirror of
https://github.com/openai/codex.git
synced 2026-11-15 21:50:46 +00:00
## Why The startup composer accepted edits but ignored submission. Its first frame also preceded configured screen settings, and startup failures could leave typed text unavailable. ## What changed - Honor configured submit bindings during startup, retaining one confirmation until the session and protected input screens are ready. Repeated submit keys do not duplicate the message; edits, `Esc`, disconnects, or destination changes cancel confirmation while preserving the draft. - Apply local screen, status-line, keymap, and paste settings before the first editable frame. Anchor the composer at the bottom in owned-screen mode and retain the loading frame until resumed history is ready to render. - Keep an in-memory recovery copy through submission acknowledgment. On startup failure, restore the terminal before printing unsent text, expanding paste placeholders and escaping terminal control characters. ## Testing Add regression coverage for deferred single submission, configured key chords, cancellation, protected input, paste handling, draft recovery, initial screen settings, and loading-frame handoff, plus a startup layout snapshot. GitOrigin-RevId: 1eb4c63027f7d59af5d42d8545cd5cb5c3594306
100 lines
3.1 KiB
Rust
100 lines
3.1 KiB
Rust
//! First-frame owned layout: the banner stays at the top and the normal composer at the bottom.
|
|
//! Measurement, paint, and cursor placement use the same bottom rectangle, including both footers.
|
|
|
|
use crossterm::cursor::SetCursorStyle;
|
|
use ratatui::buffer::Buffer;
|
|
use ratatui::layout::Rect;
|
|
use ratatui::style::Stylize;
|
|
|
|
use super::StartupDraftSessionAction;
|
|
use crate::bottom_pane::BottomPane;
|
|
use crate::bottom_pane::CommandPopupPlacement;
|
|
use crate::bottom_pane::ComposerRenderOptions;
|
|
use crate::render::renderable::Renderable;
|
|
use crate::render::renderable::RenderableItem;
|
|
|
|
pub(super) struct OwnedStartupLayout<'a> {
|
|
header: &'a dyn Renderable,
|
|
bottom: RenderableItem<'a>,
|
|
session_action: StartupDraftSessionAction,
|
|
}
|
|
|
|
impl<'a> OwnedStartupLayout<'a> {
|
|
pub(super) fn new(
|
|
header: &'a dyn Renderable,
|
|
bottom_pane: &'a BottomPane,
|
|
session_action: StartupDraftSessionAction,
|
|
) -> Self {
|
|
Self {
|
|
header,
|
|
bottom: bottom_pane.as_renderable_with_options(ComposerRenderOptions {
|
|
separate_status_line: true,
|
|
command_popup_placement: CommandPopupPlacement::Overlay,
|
|
..ComposerRenderOptions::default()
|
|
}),
|
|
session_action,
|
|
}
|
|
}
|
|
|
|
pub(super) fn bottom_area(&self, area: Rect) -> Rect {
|
|
let height = self.bottom.desired_height(area.width).min(area.height);
|
|
Rect {
|
|
y: area.bottom().saturating_sub(height),
|
|
height,
|
|
..area
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Renderable for OwnedStartupLayout<'_> {
|
|
fn render(&self, area: Rect, buf: &mut Buffer) {
|
|
let bottom = self.bottom_area(area);
|
|
let header = Rect {
|
|
height: self
|
|
.header
|
|
.desired_height(area.width)
|
|
.min(bottom.y.saturating_sub(area.y)),
|
|
..area
|
|
};
|
|
self.header.render(header, buf);
|
|
let message = match self.session_action {
|
|
StartupDraftSessionAction::New | StartupDraftSessionAction::NewFromCommandCenter => {
|
|
None
|
|
}
|
|
StartupDraftSessionAction::Resume => Some(" Resuming session…"),
|
|
StartupDraftSessionAction::Fork => Some(" Forking session…"),
|
|
};
|
|
if let Some(message) = message
|
|
&& header.bottom() < bottom.y
|
|
{
|
|
message.dim().render(
|
|
Rect {
|
|
y: header.bottom(),
|
|
height: 1,
|
|
..area
|
|
},
|
|
buf,
|
|
);
|
|
}
|
|
self.bottom.render(bottom, buf);
|
|
}
|
|
|
|
fn desired_height(&self, width: u16) -> u16 {
|
|
self.header
|
|
.desired_height(width)
|
|
.saturating_add(self.bottom.desired_height(width))
|
|
}
|
|
|
|
fn cursor_pos(&self, area: Rect) -> Option<(u16, u16)> {
|
|
self.bottom.cursor_pos(self.bottom_area(area))
|
|
}
|
|
|
|
fn cursor_style(&self, area: Rect) -> SetCursorStyle {
|
|
self.bottom.cursor_style(self.bottom_area(area))
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
#[path = "startup_draft_layout_tests.rs"]
|
|
mod tests;
|