Yield orchestrators for child groups and correct subscription context catalogs

crates/persistence/src/model.rs

@@ -1075,6 +1075,17 @@ pub struct AcpConversationData {
 }
 
 // Serializes to `conversation_data` column in `agent_conversations`.
+/// Durable membership and delivery revision for one local delegation group.
+#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
+pub struct LocalAgentGroup {
+    pub id: String,
+    pub children: Vec<String>,
+    pub launch_errors: Vec<String>,
+    pub sealed: bool,
+    pub revision: u64,
+    pub notified: bool,
+}
+
 #[derive(Debug, Serialize, Deserialize, Clone, Default)]
 pub struct AgentConversationData {
     #[serde(default, skip_serializing_if = "AgentBackend::is_provider")]
@@ -1082,6 +1093,9 @@ pub struct AgentConversationData {
     /// Versioned application-owned snapshot for an active direct-provider run.
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub active_provider_run_json: Option<String>,
+    /// Local child groups outlive the parent generation that launched them.
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub local_agent_groups: Vec<LocalAgentGroup>,
     pub server_conversation_token: Option<String>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub conversation_usage_metadata: Option<ConversationUsageMetadata>,

crates/persistence/src/model_tests.rs

@@ -138,6 +138,7 @@ fn agent_conversation_data_roundtrips_last_event_sequence() {
     let data = AgentConversationData {
         agent_backend: Default::default(),
         active_provider_run_json: None,
+        local_agent_groups: Vec::new(),
         server_conversation_token: None,
         conversation_usage_metadata: None,
         reverted_action_ids: None,
@@ -241,6 +242,7 @@ fn agent_conversation_data_roundtrips_remote_child_marker() {
     let data = AgentConversationData {
         agent_backend: Default::default(),
         active_provider_run_json: None,
+        local_agent_groups: Vec::new(),
         server_conversation_token: None,
         conversation_usage_metadata: None,
         reverted_action_ids: None,
@@ -269,6 +271,7 @@ fn agent_conversation_data_roundtrips_optimistic_root_marker() {
     let data = AgentConversationData {
         agent_backend: Default::default(),
         active_provider_run_json: None,
+        local_agent_groups: Vec::new(),
         server_conversation_token: None,
         conversation_usage_metadata: None,
         reverted_action_ids: None,
@@ -309,6 +312,7 @@ fn agent_conversation_data_skips_serializing_none_last_event_sequence() {
     let data = AgentConversationData {
         agent_backend: Default::default(),
         active_provider_run_json: None,
+        local_agent_groups: Vec::new(),
         server_conversation_token: None,
         conversation_usage_metadata: None,
         reverted_action_ids: None,
@@ -339,6 +343,7 @@ fn agent_conversation_data_roundtrips_pinned() {
     let data = AgentConversationData {
         agent_backend: Default::default(),
         active_provider_run_json: None,
+        local_agent_groups: Vec::new(),
         server_conversation_token: None,
         conversation_usage_metadata: None,
         reverted_action_ids: None,
@@ -367,6 +372,7 @@ fn agent_conversation_data_skips_serializing_unpinned() {
     let data = AgentConversationData {
         agent_backend: Default::default(),
         active_provider_run_json: None,
+        local_agent_groups: Vec::new(),
         server_conversation_token: None,
         conversation_usage_metadata: None,
         reverted_action_ids: None,