Merge remote-tracking branch 'origin/main'

# Conflicts:
#	app/androidApp/src/main/kotlin/com/example/aiapp/Sizes.kt
This commit is contained in:
iris committed 2026-09-04 15:03:37 -04:00
commit e3e02d55f7
29 files changed
+2737 -479

No files matched your search

+12 -1
View File
@@ -1798,9 +1798,20 @@ async fn stream_session(
/// and local; revisit if daily use produces transcripts where this shows
/// (phase 6 territory).
async fn send_backlog(transcript: &Path, last: &mut u64, tx: &mpsc::Sender<SseEvent>) -> bool {
let cursor = *last;
let entries = match catch_up(transcript, *last, CATCH_UP_LIMIT) {
Ok(CatchUp::Continue(entries)) => entries,
Ok(CatchUp::Continue(entries)) => {
// The pair of them at debug, because "was this subscriber reset,
// and how far behind was it" is a question about a phone that
// nothing else here can answer -- the app sees a window arrive
// and cannot tell how far it had fallen, and a reset is the one
// thing that makes its screen jump. `RUST_LOG=ai_server=debug`,
// beside the transcript pages.
tracing::debug!(cursor, sent = entries.len(), "stream backlog: continue");
entries
}
Ok(CatchUp::Restart(entries)) => {
tracing::debug!(cursor, sent = entries.len(), "stream backlog: reset");
if tx.send(SseEvent::default().event("reset")).await.is_err() {
return false;
}