rework message styling (#2877)
https://github.com/user-attachments/assets/cf07f62b-1895-44bb-b9c3-7a12032eb371
This commit is contained in:
@@ -1,3 +1,5 @@
|
||||
use crate::history_cell;
|
||||
use crate::history_cell::HistoryCell;
|
||||
use codex_core::config::Config;
|
||||
use ratatui::text::Line;
|
||||
|
||||
@@ -6,7 +8,7 @@ use super::StreamState;
|
||||
|
||||
/// Sink for history insertions and animation control.
|
||||
pub(crate) trait HistorySink {
|
||||
fn insert_history(&self, lines: Vec<Line<'static>>);
|
||||
fn insert_history_cell(&self, cell: Box<dyn HistoryCell>);
|
||||
fn start_commit_animation(&self);
|
||||
fn stop_commit_animation(&self);
|
||||
}
|
||||
@@ -15,9 +17,9 @@ pub(crate) trait HistorySink {
|
||||
pub(crate) struct AppEventHistorySink(pub(crate) crate::app_event_sender::AppEventSender);
|
||||
|
||||
impl HistorySink for AppEventHistorySink {
|
||||
fn insert_history(&self, lines: Vec<Line<'static>>) {
|
||||
fn insert_history_cell(&self, cell: Box<dyn crate::history_cell::HistoryCell>) {
|
||||
self.0
|
||||
.send(crate::app_event::AppEvent::InsertHistoryLines(lines))
|
||||
.send(crate::app_event::AppEvent::InsertHistoryCell(cell))
|
||||
}
|
||||
fn start_commit_animation(&self) {
|
||||
self.0
|
||||
@@ -66,10 +68,6 @@ impl StreamController {
|
||||
// leave header state unchanged; caller decides when to reset
|
||||
}
|
||||
|
||||
fn emit_header_if_needed(&mut self, out_lines: &mut Lines) -> bool {
|
||||
self.header.maybe_emit(out_lines)
|
||||
}
|
||||
|
||||
/// Begin an answer stream. Does not emit header yet; it is emitted on first commit.
|
||||
pub(crate) fn begin(&mut self, _sink: &impl HistorySink) {
|
||||
// Starting a new stream cancels any pending finish-from-previous-stream animation.
|
||||
@@ -124,10 +122,11 @@ impl StreamController {
|
||||
out_lines.extend(step.history);
|
||||
}
|
||||
if !out_lines.is_empty() {
|
||||
let mut lines_with_header: Lines = Vec::new();
|
||||
self.emit_header_if_needed(&mut lines_with_header);
|
||||
lines_with_header.extend(out_lines);
|
||||
sink.insert_history(lines_with_header);
|
||||
// Insert as a HistoryCell so display drops the header while transcript keeps it.
|
||||
sink.insert_history_cell(Box::new(history_cell::AgentMessageCell::new(
|
||||
out_lines,
|
||||
self.header.maybe_emit_header(),
|
||||
)));
|
||||
}
|
||||
|
||||
// Cleanup
|
||||
@@ -159,11 +158,10 @@ impl StreamController {
|
||||
}
|
||||
let step = { self.state.step() };
|
||||
if !step.history.is_empty() {
|
||||
let mut lines: Lines = Vec::new();
|
||||
self.emit_header_if_needed(&mut lines);
|
||||
let mut out = lines;
|
||||
out.extend(step.history);
|
||||
sink.insert_history(out);
|
||||
sink.insert_history_cell(Box::new(history_cell::AgentMessageCell::new(
|
||||
step.history,
|
||||
self.header.maybe_emit_header(),
|
||||
)));
|
||||
}
|
||||
|
||||
let is_idle = self.state.is_idle();
|
||||
@@ -244,8 +242,9 @@ mod tests {
|
||||
}
|
||||
}
|
||||
impl HistorySink for TestSink {
|
||||
fn insert_history(&self, lines: Vec<Line<'static>>) {
|
||||
self.lines.borrow_mut().push(lines);
|
||||
fn insert_history_cell(&self, cell: Box<dyn crate::history_cell::HistoryCell>) {
|
||||
// For tests, store the transcript representation of the cell.
|
||||
self.lines.borrow_mut().push(cell.transcript_lines());
|
||||
}
|
||||
fn start_commit_animation(&self) {}
|
||||
fn stop_commit_animation(&self) {}
|
||||
|
||||
Reference in New Issue
Block a user