feat: Implement Phase 3.5 - Supervisor Status APImakima/contract-management-phase3

- Add SupervisorStatusResponse for status endpoint
- Add SupervisorHeartbeatEntry and history response types
- Add SupervisorSyncResponse for sync endpoint
- Add HeartbeatHistoryQuery for pagination
- Resolve merge conflict keeping both API types and unit tests

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

1 files changed, 4 insertions, 0 deletions

diff --git a/makima/src/server/mod.rs b/makima/src/server/mod.rs
index 8456006..e5415ae 100644
--- a/makima/src/server/mod.rs
+++ b/makima/src/server/mod.rs
@@ -175,6 +175,10 @@ pub fn make_router(state: SharedState) -> Router {
         // Contract supervisor resume endpoints
         .route("/contracts/{id}/supervisor/resume", post(mesh_supervisor::resume_supervisor))
         .route("/contracts/{id}/supervisor/conversation/rewind", post(mesh_supervisor::rewind_conversation))
+        // Contract supervisor status endpoints
+        .route("/contracts/{id}/supervisor/status", get(contracts::get_supervisor_status))
+        .route("/contracts/{id}/supervisor/heartbeats", get(contracts::get_supervisor_heartbeats))
+        .route("/contracts/{id}/supervisor/sync", post(contracts::sync_supervisor))
         // History endpoints
         .route("/contracts/{id}/history", get(history::get_contract_history))
         .route("/contracts/{id}/supervisor/conversation", get(history::get_supervisor_conversation))