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

fix(tui/streaming): merge final Reasoning content with streamed deltas to avoid losing text; preserve committed lines before finalize

Browse Source
This commit is contained in:
James Peter
2025-09-01 20:52:46 +10:00
parent ddf6b68ad2
commit 2e5f4f89c5
1 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/tui/src/streaming/controller.rs
+26 -4
View File
@@ -507,11 +507,33 @@ impl StreamController {
if self.current_stream == Some(kind) {
let state = self.state(kind);
let has_delta = state.has_seen_delta;
if has_delta {
// This is the final event for content we've been streaming via deltas
// Just finalize what we have, don't inject the full message
tracing::debug!("Already streaming {:?} via deltas, finalizing without injection", kind);
// Many providers send a final reasoning/message that may include
// text not present in prior deltas. For Reasoning, prefer to
// merge the final message into the collector to avoid losing
// content, preserving the number of already committed lines so
// we don't duplicate what the user already saw.
if matches!(kind, StreamKind::Reasoning) && !message.is_empty() {
tracing::debug!(
"Merging final {:?} content into collector before finalize (len={})",
kind,
message.len()
);
let committed = state.collector.committed_count();
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);
return self.finalize(kind, immediate, sink);
}
// For Answer (or empty message), finalize existing streamed content.
tracing::debug!(
"Already streaming {:?} via deltas, finalizing without injection",
kind
);
return self.finalize(kind, immediate, sink);
} else if self.finishing_after_drain {
// We're already in the process of finishing this stream (animation phase)