feat(maestro): project ACP transcript state
This commit is contained in:
@@ -755,6 +755,87 @@ pub enum CatalogEvent {
|
||||
},
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Structured-session projections
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
/// One client-neutral item in a structured session transcript.
|
||||
///
|
||||
/// `data` preserves the ACP payload without committing clients to an ACP
|
||||
/// dependency. Rendering choices, including markdown and tool-card treatment,
|
||||
/// stay with the client.
|
||||
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
||||
pub struct TranscriptRow {
|
||||
/// Stable within one session, so later deltas can address this row.
|
||||
pub id: String,
|
||||
pub kind: TranscriptRowKind,
|
||||
pub data: Value,
|
||||
}
|
||||
|
||||
/// The semantic shape of a [`TranscriptRow`].
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
|
||||
#[serde(rename_all = "snake_case")]
|
||||
pub enum TranscriptRowKind {
|
||||
User,
|
||||
AgentText,
|
||||
AgentThought,
|
||||
ToolCall,
|
||||
ToolDiff,
|
||||
Approval,
|
||||
Plan,
|
||||
Notice,
|
||||
}
|
||||
|
||||
/// A complete transcript at a durable event-log position.
|
||||
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
||||
pub struct TranscriptSnapshot {
|
||||
pub cursor: u64,
|
||||
#[serde(default)]
|
||||
pub rows: Vec<TranscriptRow>,
|
||||
}
|
||||
|
||||
/// A change to a transcript row.
|
||||
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
||||
#[serde(tag = "type", rename_all = "snake_case")]
|
||||
pub enum TranscriptDelta {
|
||||
Append { row: TranscriptRow },
|
||||
Patch { row: TranscriptRow },
|
||||
Remove { id: String },
|
||||
}
|
||||
|
||||
/// Per-turn indicators derived from the ACP stream.
|
||||
#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
|
||||
pub struct TurnState {
|
||||
#[serde(default)]
|
||||
pub responding: bool,
|
||||
#[serde(default)]
|
||||
pub thinking: bool,
|
||||
#[serde(default)]
|
||||
pub active_tool_calls: Vec<String>,
|
||||
}
|
||||
|
||||
/// A whole-session view derived from ACP notifications.
|
||||
///
|
||||
/// Values whose shape ACP owns are carried as JSON so this wire protocol stays
|
||||
/// forward-compatible when ACP adds fields or variants.
|
||||
#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
|
||||
pub struct ReducedState {
|
||||
#[serde(default)]
|
||||
pub turn: TurnState,
|
||||
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||
pub pending_approval: Option<Value>,
|
||||
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||
pub plan: Option<Value>,
|
||||
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||
pub usage: Option<Value>,
|
||||
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||
pub context: Option<Value>,
|
||||
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||
pub model: Option<String>,
|
||||
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||
pub mode: Option<String>,
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Client ↔ Daemon control messages (text frames on the attach WS)
|
||||
// ---------------------------------------------------------------------------
|
||||
@@ -1144,6 +1225,31 @@ mod tests {
|
||||
assert_eq!(structured, round_trip(&structured));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn structured_projection_types_round_trip_and_default() {
|
||||
let row = TranscriptRow {
|
||||
id: "tool:read-1".into(),
|
||||
kind: TranscriptRowKind::ToolCall,
|
||||
data: serde_json::json!({"name": "vendor.read", "title": "Read"}),
|
||||
};
|
||||
let snapshot = TranscriptSnapshot {
|
||||
cursor: 7,
|
||||
rows: vec![row.clone()],
|
||||
};
|
||||
assert_eq!(snapshot, round_trip(&snapshot));
|
||||
assert_eq!(
|
||||
TranscriptDelta::Patch { row: row.clone() },
|
||||
round_trip(&TranscriptDelta::Patch { row })
|
||||
);
|
||||
|
||||
let state: ReducedState = serde_json::from_value(serde_json::json!({})).unwrap();
|
||||
assert_eq!(state, ReducedState::default());
|
||||
assert_eq!(
|
||||
serde_json::to_value(TranscriptRowKind::AgentThought).unwrap(),
|
||||
serde_json::json!("agent_thought")
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn acp_session_id_defaults_to_none_and_round_trips() {
|
||||
// A payload from before #134 carries no `acp_session_id`; it must
|
||||
|
||||
Reference in New Issue
Block a user