hanzoai/dev
2
0
Fork 0
mirror of https://github.com/hanzoai/dev.git synced 2026-10-25 03:32:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(tui): revert unrelated streaming/history changes from previous commit; keep resume dialog theming only

Browse Source
This commit is contained in:
James Peter
2025-09-04 09:26:33 +10:00
parent 538e3e1091
commit f7e857d5b3
2 changed files with 7 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/tui/src/history_cell.rs
+6 -14
View File
@@ -3093,7 +3093,7 @@ impl HistoryCell for CollapsibleReasoningCell {
pub(crate) struct StreamingContentCell {
pub(crate) id: Option<String>,
pub(crate) lines: Vec<Line<'static>>,
// Show an ellipsis appended to the last line while streaming
// Show an ellipsis on a new line while streaming is in progress
pub(crate) show_ellipsis: bool,
}
@@ -3193,7 +3193,9 @@ impl HistoryCell for StreamingContentCell {
}
}
}
total.saturating_add(2)
let mut total = total.saturating_add(2);
if self.show_ellipsis { total = total.saturating_add(1); }
total
}
fn custom_render_with_skip(&self, area: Rect, buf: &mut Buffer, skip_rows: u16) {
// Render with a 1-row top and bottom padding, all using the assistant bg tint.
@@ -3253,19 +3255,9 @@ impl HistoryCell for StreamingContentCell {
_is_first_output_line = false;
}
if !text_buf.is_empty() { segs.push(Seg::Text(std::mem::take(&mut text_buf))); }
// If streaming, append an ellipsis span to the last line of the last segment
// Append an ellipsis line as its own segment when streaming
if self.show_ellipsis {
if let Some(last) = segs.last_mut() {
match last {
Seg::Text(lines) | Seg::Bullet(lines) | Seg::Code(lines) => {
if let Some(last_line) = lines.last_mut() {
let mut spans = std::mem::take(&mut last_line.spans);
spans.push(Span::styled(" …", Style::default().fg(crate::colors::text_dim())));
last_line.spans = spans;
}
}
}
}
segs.push(Seg::Text(vec![Line::from("…".dim())]));
}
// Streaming-style top padding row
codex-rs/tui/src/streaming/controller.rs
+1 -42
View File
@@ -621,53 +621,12 @@ impl StreamController {
message.len()
);
let committed = state.collector.committed_count();
// Heuristic fix: if the very first committed line looks like
// a truncated title (prefix of the final first line), drop it
// from the committed region so the final replaces it.
let cfg = self.config.clone();
// Render current buffer preview
let prior_src = state.collector.full_render_source_preview();
let mut prior_lines: Vec<ratatui::text::Line<'static>> = Vec::new();
crate::markdown::append_markdown(&prior_src, &mut prior_lines, &cfg);
// Extract first non-blank among the already committed lines
let committed_first = if committed > 0 {
let mut out = String::new();
for l in prior_lines.iter().take(committed) {
if !crate::render::line_utils::is_blank_line_trim(l) {
out = l.spans.iter().map(|s| s.content.clone()).collect::<Vec<_>>().join("");
break;
}
}
out
} else { String::new() };
// Render final message's first line
let mut final_lines: Vec<ratatui::text::Line<'static>> = Vec::new();
let mut msg_preview = message.to_string();
if !msg_preview.ends_with('\n') { msg_preview.push('\n'); }
crate::markdown::append_markdown(&msg_preview, &mut final_lines, &cfg);
let final_first = final_lines.iter()
.find(|l| !crate::render::line_utils::is_blank_line_trim(l))
.map(|l| l.spans.iter().map(|s| s.content.clone()).collect::<Vec<_>>().join(""))
.unwrap_or_default();
let mut committed_adj = committed;
if committed > 0
&& !committed_first.is_empty()
&& final_first.starts_with(&committed_first)
&& final_first.len() > committed_first.len()
&& committed_first.chars().count() <= 16
{
committed_adj = committed.saturating_sub(1);
tracing::debug!(
"reasoning prefix-upgrade: committed_first='{}' -> final_first='{}' (committed {}->{}))",
committed_first, final_first, committed, committed_adj
);
}
let mut msg = message.to_owned();
if !msg.ends_with('\n') { msg.push('\n'); }
let state_mut = self.state_mut(kind);
state_mut
.collector
.replace_with_and_mark_committed(&msg, committed_adj);
.replace_with_and_mark_committed(&msg, committed);
return self.finalize(kind, immediate, sink);
}
// For Answer (or empty message), finalize existing streamed content.