manager events: Spawned/Rebuilt/Killed/Destroyed + start button

hive-c0re/src/actions.rs

@@ -6,9 +6,7 @@
 use std::sync::Arc;
 
 use anyhow::{Result, bail};
-use hive_sh4re::{
-    ApprovalKind, ApprovalStatus, HelperEvent, MANAGER_AGENT, Message, SYSTEM_SENDER,
-};
+use hive_sh4re::{ApprovalKind, ApprovalStatus, HelperEvent, MANAGER_AGENT};
 
 use crate::coordinator::{Coordinator, TransientKind};
 use crate::lifecycle::{self, MANAGER_NAME};
@@ -90,36 +88,39 @@ fn finish_approval(
     approval: &hive_sh4re::Approval,
     result: Result<()>,
 ) -> Result<()> {
-    match result {
-        Ok(()) => {
-            notify_manager(
-                coord,
-                &HelperEvent::ApprovalResolved {
-                    id: approval.id,
-                    agent: approval.agent.clone(),
-                    commit_ref: approval.commit_ref.clone(),
-                    status: ApprovalStatus::Approved,
-                    note: None,
-                },
-            );
-            Ok(())
-        }
+    let (status, note, ok) = match &result {
+        Ok(()) => (ApprovalStatus::Approved, None, true),
         Err(e) => {
             let note = format!("{e:#}");
             let _ = coord.approvals.mark_failed(approval.id, &note);
-            notify_manager(
-                coord,
-                &HelperEvent::ApprovalResolved {
-                    id: approval.id,
-                    agent: approval.agent.clone(),
-                    commit_ref: approval.commit_ref.clone(),
-                    status: ApprovalStatus::Failed,
-                    note: Some(note),
-                },
-            );
-            Err(e)
+            (ApprovalStatus::Failed, Some(note), false)
         }
+    };
+    coord.notify_manager(&HelperEvent::ApprovalResolved {
+        id: approval.id,
+        agent: approval.agent.clone(),
+        commit_ref: approval.commit_ref.clone(),
+        status,
+        note: note.clone(),
+    });
+    // For spawn/rebuild approvals, also surface the underlying action so
+    // the manager knows whether the container actually came up. The
+    // ApprovalResolved event already carries the same `ok` signal but
+    // separating it lets the manager react to the lifecycle change
+    // without having to special-case approvals.
+    match approval.kind {
+        ApprovalKind::Spawn => coord.notify_manager(&HelperEvent::Spawned {
+            agent: approval.agent.clone(),
+            ok,
+            note,
+        }),
+        ApprovalKind::ApplyCommit => coord.notify_manager(&HelperEvent::Rebuilt {
+            agent: approval.agent.clone(),
+            ok,
+            note,
+        }),
     }
+    result
 }
 
 /// Tear down a sub-agent container. By default this is non-destructive to
@@ -144,6 +145,9 @@ pub async fn destroy(coord: &Coordinator, name: &str) -> Result<()> {
     let _ = coord
         .approvals
         .fail_pending_for_agent(name, "agent destroyed");
+    coord.notify_manager(&HelperEvent::Destroyed {
+        agent: name.to_owned(),
+    });
     Ok(())
 }
 
@@ -152,33 +156,13 @@ pub fn deny(coord: &Coordinator, id: i64) -> Result<()> {
     coord.approvals.mark_denied(id)?;
     tracing::info!(%id, "approval denied");
     if let Some(a) = approval {
-        notify_manager(
-            coord,
-            &HelperEvent::ApprovalResolved {
-                id: a.id,
-                agent: a.agent,
-                commit_ref: a.commit_ref,
-                status: ApprovalStatus::Denied,
-                note: None,
-            },
-        );
+        coord.notify_manager(&HelperEvent::ApprovalResolved {
+            id: a.id,
+            agent: a.agent,
+            commit_ref: a.commit_ref,
+            status: ApprovalStatus::Denied,
+            note: None,
+        });
     }
     Ok(())
 }
-
-fn notify_manager(coord: &Coordinator, event: &HelperEvent) {
-    let body = match serde_json::to_string(event) {
-        Ok(s) => s,
-        Err(e) => {
-            tracing::warn!(error = ?e, "failed to encode helper event");
-            return;
-        }
-    };
-    if let Err(e) = coord.broker.send(&Message {
-        from: SYSTEM_SENDER.to_owned(),
-        to: MANAGER_AGENT.to_owned(),
-        body,
-    }) {
-        tracing::warn!(error = ?e, "failed to push helper event to manager");
-    }
-}