From 5f8cc2a1409acecee7cf979e9c3cc02bf6a292b6 Mon Sep 17 00:00:00 2001 From: Miguel Palhas Date: Sat, 12 Sep 2026 19:54:00 +0100 Subject: [PATCH] fix(maestro): drain notifications before signaling turn-done The event pump now handles AcpUpdate::TurnDone markers that arrive in the same FIFO as notifications. It fires the done oneshot only after persisting every preceding notification, so finish_queued_acp_turn can no longer race ahead of the transcript. Co-Authored-By: Claude Opus 4.6 --- crates/maestro-daemon/src/session.rs | 61 ++++++++++++++++------------ 1 file changed, 36 insertions(+), 25 deletions(-) diff --git a/crates/maestro-daemon/src/session.rs b/crates/maestro-daemon/src/session.rs index ac3b504..dfcdc68 100644 --- a/crates/maestro-daemon/src/session.rs +++ b/crates/maestro-daemon/src/session.rs @@ -2403,34 +2403,45 @@ fn start_acp_event_pump( let weak_inner = Arc::downgrade(inner); let weak_acp = Arc::downgrade(acp); tokio::spawn(async move { - while let Some(notification) = updates.recv().await { - let append_error = { - let mut events = events.lock().await; - let event = PersistedEvent::Notification(Box::new(notification)); - match events.log.append(&event) { - Ok(seq) => { - let logged = LoggedEvent { - seq, - event: event.clone(), - }; - let projected = apply_persisted_event(&mut events.projection, &logged); - let _ = events.live.send(logged); - events.broadcast(projected); - None + while let Some(update) = updates.recv().await { + match update { + maestro_acp::AcpUpdate::Notification(notification) => { + let append_error = { + let mut events = events.lock().await; + let event = PersistedEvent::Notification(Box::new(notification)); + match events.log.append(&event) { + Ok(seq) => { + let logged = LoggedEvent { + seq, + event: event.clone(), + }; + let projected = + apply_persisted_event(&mut events.projection, &logged); + let _ = events.live.send(logged); + events.broadcast(projected); + None + } + Err(error) => Some(error), + } + }; + if let Some(error) = append_error { + tracing::error!(%id, %error, "structured event log append failed"); + if let Some(acp) = weak_acp.upgrade() { + acp.terminate(maestro_acp::CANCEL_GRACE, maestro_acp::TERM_GRACE) + .await; + } + if let Some(inner) = weak_inner.upgrade() { + mark_session_dead(&inner, id).await; + } + break; } - Err(error) => Some(error), } - }; - if let Some(error) = append_error { - tracing::error!(%id, %error, "structured event log append failed"); - if let Some(acp) = weak_acp.upgrade() { - acp.terminate(maestro_acp::CANCEL_GRACE, maestro_acp::TERM_GRACE) - .await; + maestro_acp::AcpUpdate::TurnDone { turn: _, result, done } => { + // Every notification for this turn has been persisted and + // broadcast above. Signal the done oneshot so + // finish_queued_acp_turn runs with the transcript complete. + let _ = done.send(result); } - if let Some(inner) = weak_inner.upgrade() { - mark_session_dead(&inner, id).await; - } - break; } } let _ = done_tx.send(true);