fix(daemon): persist structured user prompts
This commit is contained in:
@@ -192,7 +192,8 @@ impl Projection {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn restore_approval(&mut self, row: TranscriptRow) -> ProjectionUpdate {
|
||||
pub fn restore_row(&mut self, row: TranscriptRow) -> ProjectionUpdate {
|
||||
self.anonymous_content_row = None;
|
||||
let transcript = if !self.row_index.contains_key(&row.id) {
|
||||
self.row_index.insert(row.id.clone(), self.rows.len());
|
||||
self.rows.push(row.clone());
|
||||
@@ -454,7 +455,7 @@ fn model_from_options(value: &Value) -> Option<String> {
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use maestro_acp::schema::SessionNotification;
|
||||
use maestro_protocol::{TranscriptDelta, TranscriptRowKind};
|
||||
use maestro_protocol::{TranscriptDelta, TranscriptRow, TranscriptRowKind};
|
||||
|
||||
use super::{Projection, TurnLifecycle};
|
||||
|
||||
@@ -572,6 +573,36 @@ mod tests {
|
||||
assert_eq!(rows[1].data.pointer("/content/text").unwrap(), "pong");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn restored_user_prompt_delimits_anonymous_agent_rows() {
|
||||
let mut projection = Projection::default();
|
||||
projection.apply(
|
||||
1,
|
||||
&event(serde_json::json!({
|
||||
"sessionUpdate": "agent_message_chunk",
|
||||
"content": {"type": "text", "text": "before"},
|
||||
})),
|
||||
);
|
||||
projection.restore_row(TranscriptRow {
|
||||
id: "user:prompt".into(),
|
||||
kind: TranscriptRowKind::User,
|
||||
data: serde_json::json!({"content": {"type": "text", "text": "next"}}),
|
||||
});
|
||||
projection.apply(
|
||||
2,
|
||||
&event(serde_json::json!({
|
||||
"sessionUpdate": "agent_message_chunk",
|
||||
"content": {"type": "text", "text": "after"},
|
||||
})),
|
||||
);
|
||||
|
||||
let rows = projection.snapshot(2).rows;
|
||||
assert_eq!(rows.len(), 3);
|
||||
assert_eq!(rows[0].data.pointer("/content/text").unwrap(), "before");
|
||||
assert_eq!(rows[1].kind, TranscriptRowKind::User);
|
||||
assert_eq!(rows[2].data.pointer("/content/text").unwrap(), "after");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn tool_update_patches_the_original_stable_row() {
|
||||
let mut projection = Projection::default();
|
||||
@@ -905,7 +936,7 @@ mod tests {
|
||||
panic!("approval row")
|
||||
};
|
||||
let mut recovered = Projection::default();
|
||||
let update = recovered.restore_approval(row.clone());
|
||||
let update = recovered.restore_row(row.clone());
|
||||
assert_eq!(
|
||||
update.transcript,
|
||||
Some(TranscriptDelta::Append { row: row.clone() })
|
||||
|
||||
@@ -18,8 +18,8 @@ use chrono::Utc;
|
||||
use maestro_acp::{AcpSession, PermissionRequest, SpawnConfig};
|
||||
use maestro_protocol::{
|
||||
ActivityState, CatalogEvent, CreateSessionRequest, ErrorInfo, NameSource, Session,
|
||||
SessionStatus, SessionView, StructuredReplayEvent, TranscriptDelta, WorktreeSpec, NAME_KEY,
|
||||
NAME_SOURCE_KEY,
|
||||
SessionStatus, SessionView, StructuredReplayEvent, TranscriptDelta, TranscriptRow,
|
||||
TranscriptRowKind, WorktreeSpec, NAME_KEY, NAME_SOURCE_KEY,
|
||||
};
|
||||
use tokio::sync::{broadcast, oneshot, watch, Mutex, Notify};
|
||||
use uuid::Uuid;
|
||||
@@ -719,6 +719,27 @@ impl SessionManager {
|
||||
if stream.projection.turn_active() {
|
||||
return Ok(QueueAcpPrompt::InFlight);
|
||||
}
|
||||
let row = TranscriptRow {
|
||||
id: format!("user:{}", Uuid::new_v4()),
|
||||
kind: TranscriptRowKind::User,
|
||||
data: serde_json::json!({
|
||||
"content": {"type": "text", "text": text},
|
||||
}),
|
||||
};
|
||||
let event = PersistedEvent::User { row: row.clone() };
|
||||
let seq = match stream.log.append(&event) {
|
||||
Ok(seq) => seq,
|
||||
Err(error) => {
|
||||
if matches!(error, AppendError::Fatal { .. }) {
|
||||
stream.dispatch.failed = true;
|
||||
}
|
||||
return Ok(QueueAcpPrompt::Failed(error.to_string()));
|
||||
}
|
||||
};
|
||||
let logged = LoggedEvent { seq, event };
|
||||
let projected = stream.projection.restore_row(row);
|
||||
let _ = stream.live.send(logged);
|
||||
let _ = stream.projected_live.send(projected);
|
||||
let (turn, update) = stream.projection.begin_turn();
|
||||
let _ = stream.projected_live.send(update);
|
||||
match acp.prompt(text.clone(), turn) {
|
||||
@@ -2118,7 +2139,9 @@ fn start_acp_event_pump(
|
||||
fn apply_persisted_event(projection: &mut Projection, event: &LoggedEvent) -> ProjectionUpdate {
|
||||
match &event.event {
|
||||
PersistedEvent::Notification(notification) => projection.apply(event.seq, notification),
|
||||
PersistedEvent::Approval { row } => projection.restore_approval(row.clone()),
|
||||
PersistedEvent::User { row } | PersistedEvent::Approval { row } => {
|
||||
projection.restore_row(row.clone())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -263,6 +263,9 @@ pub struct LoggedEvent {
|
||||
#[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)]
|
||||
#[serde(tag = "maestroEvent", rename_all = "snake_case")]
|
||||
pub enum PersistedEvent {
|
||||
User {
|
||||
row: TranscriptRow,
|
||||
},
|
||||
Approval {
|
||||
row: TranscriptRow,
|
||||
},
|
||||
|
||||
@@ -355,6 +355,51 @@ async fn projection_snapshot_and_live_stream_share_one_fold() {
|
||||
fx.manager.kill(session.id, false).await.expect("kill");
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn queued_prompt_is_a_durable_user_transcript_row() {
|
||||
let fx = DaemonFixture::new();
|
||||
let fake = Fake::new();
|
||||
let cwd = TempDir::new().unwrap();
|
||||
let session = fx
|
||||
.manager
|
||||
.create(structured(cwd.path(), fake.env()))
|
||||
.await
|
||||
.expect("create");
|
||||
|
||||
assert!(matches!(
|
||||
fx.manager
|
||||
.queue_acp_prompt(session.id, "show my prompt".into())
|
||||
.await
|
||||
.expect("queue prompt"),
|
||||
maestro_daemon::session::QueueAcpPrompt::Queued
|
||||
));
|
||||
|
||||
let (snapshot, _, _) = fx
|
||||
.manager
|
||||
.subscribe_acp_projection(session.id, EventCursor::Since(0))
|
||||
.await
|
||||
.expect("projection subscription")
|
||||
.expect("structured session");
|
||||
let user = snapshot
|
||||
.rows
|
||||
.iter()
|
||||
.find(|row| row.kind == TranscriptRowKind::User)
|
||||
.expect("user prompt row");
|
||||
assert_eq!(user.data["content"]["text"], "show my prompt");
|
||||
|
||||
let persisted = fx
|
||||
.manager
|
||||
.read_acp_events(session.id, EventCursor::Since(0), 100)
|
||||
.expect("event replay");
|
||||
assert!(persisted.iter().any(|event| matches!(
|
||||
&event.event,
|
||||
maestro_daemon::sidecar::PersistedEvent::User { row }
|
||||
if row.data["content"]["text"] == "show my prompt"
|
||||
)));
|
||||
|
||||
fx.manager.kill(session.id, false).await.unwrap();
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn stale_turn_completion_cannot_end_the_next_turn() {
|
||||
let fx = DaemonFixture::new();
|
||||
|
||||
Reference in New Issue
Block a user