[WIP] Heartbeat checkpoint - 2026-01-26 18:34:19 UTC

2 files changed, 57 insertions, 2 deletions

diff --git a/makima/src/server/handlers/mesh.rs b/makima/src/server/handlers/mesh.rs
index 3d64eb4..d266b12 100644
--- a/makima/src/server/handlers/mesh.rs
+++ b/makima/src/server/handlers/mesh.rs
@@ -599,6 +599,16 @@ pub async fn start_task(
             .into_response();
     }
 
+    // Get local_only flag from contract if task has one
+    let local_only = if let Some(contract_id) = task.contract_id {
+        match repository::get_contract_for_owner(pool, contract_id, auth.owner_id).await {
+            Ok(Some(contract)) => contract.local_only,
+            _ => false,
+        }
+    } else {
+        false
+    };
+
     // Get list of daemons that have previously failed this task
     let mut exclude_daemon_ids: Vec<Uuid> = task.failed_daemon_ids.clone().unwrap_or_default();
 
@@ -694,6 +704,7 @@ pub async fn start_task(
         conversation_history: None,
         patch_data: None,
         patch_base_sha: None,
+        local_only,
     };
 
     tracing::info!(
@@ -746,6 +757,7 @@ pub async fn start_task(
                     conversation_history: None,
                     patch_data: None,
                     patch_base_sha: None,
+                    local_only,
                 };
 
                 if state.send_daemon_command(alt_daemon_id, alt_command).await.is_ok() {
@@ -1128,6 +1140,16 @@ pub async fn send_message(
                 };
 
                 if let Ok(Some(updated_task)) = repository::update_task_for_owner(pool, id, auth.owner_id, update_req).await {
+                    // Get local_only from contract if task has one
+                    let local_only = if let Some(contract_id) = updated_task.contract_id {
+                        match repository::get_contract_for_owner(pool, contract_id, auth.owner_id).await {
+                            Ok(Some(contract)) => contract.local_only,
+                            _ => false,
+                        }
+                    } else {
+                        false
+                    };
+
                     // Send spawn command to new daemon
                     let spawn_cmd = DaemonCommand::SpawnTask {
                         task_id: id,
@@ -1150,6 +1172,7 @@ pub async fn send_message(
                         conversation_history: None,
                         patch_data: None,
                         patch_base_sha: None,
+                        local_only,
                     };
 
                     if state.send_daemon_command(new_daemon_id, spawn_cmd).await.is_ok() {
@@ -2293,6 +2316,16 @@ pub async fn reassign_task(
         }
     };
 
+    // Get local_only from contract if task has one
+    let local_only = if let Some(contract_id) = task.contract_id {
+        match repository::get_contract_for_owner(pool, contract_id, auth.owner_id).await {
+            Ok(Some(contract)) => contract.local_only,
+            _ => false,
+        }
+    } else {
+        false
+    };
+
     // Send SpawnTask command to daemon for the new task
     let command = DaemonCommand::SpawnTask {
         task_id: new_task.id,
@@ -2315,6 +2348,7 @@ pub async fn reassign_task(
         conversation_history: None,
         patch_data,
         patch_base_sha,
+        local_only,
     };
 
     tracing::info!(
@@ -2620,6 +2654,16 @@ pub async fn continue_task(
     };
     let is_orchestrator = task.depth == 0 && subtask_count > 0;
 
+    // Get local_only from contract if task has one
+    let local_only = if let Some(contract_id) = task.contract_id {
+        match repository::get_contract_for_owner(pool, contract_id, auth.owner_id).await {
+            Ok(Some(contract)) => contract.local_only,
+            _ => false,
+        }
+    } else {
+        false
+    };
+
     // Send SpawnTask command to daemon
     let command = DaemonCommand::SpawnTask {
         task_id: id,
@@ -2642,6 +2686,7 @@ pub async fn continue_task(
         conversation_history: None,
         patch_data: None,
         patch_base_sha: None,
+        local_only,
     };
 
     tracing::info!(
@@ -3538,6 +3583,7 @@ pub async fn branch_task(
                 conversation_history: updated_task.conversation_state.clone(),
                 patch_data: None,
                 patch_base_sha: None,
+                local_only: false, // No contract, so not local_only
             };
 
             if let Err(e) = state.send_daemon_command(target_daemon_id, command).await {
diff --git a/makima/src/server/handlers/mesh_supervisor.rs b/makima/src/server/handlers/mesh_supervisor.rs
index 1b5e376..65017c4 100644
--- a/makima/src/server/handlers/mesh_supervisor.rs
+++ b/makima/src/server/handlers/mesh_supervisor.rs
@@ -297,6 +297,12 @@ pub async fn try_start_pending_task(
         return Ok(None);
     }
 
+    // Get contract to check local_only flag
+    let contract = repository::get_contract_for_owner(pool, contract_id, owner_id)
+        .await
+        .map_err(|e| format!("Failed to get contract: {}", e))?
+        .ok_or_else(|| "Contract not found".to_string())?;
+
     // Try each pending task until we find one we can start
     for task in &pending_tasks {
         // Get excluded daemon IDs for this task (daemons that have already failed it)
@@ -399,6 +405,7 @@ pub async fn try_start_pending_task(
             conversation_history: None,
             patch_data,
             patch_base_sha,
+            local_only: contract.local_only,
         };
 
         if let Err(e) = state.send_daemon_command(daemon.id, cmd).await {
@@ -532,8 +539,8 @@ pub async fn spawn_task(
 
     let pool = state.db_pool.as_ref().unwrap();
 
-    // Verify contract exists
-    let _contract = match repository::get_contract_for_owner(pool, request.contract_id, owner_id).await {
+    // Verify contract exists and get local_only flag
+    let contract = match repository::get_contract_for_owner(pool, request.contract_id, owner_id).await {
         Ok(Some(c)) => c,
         Ok(None) => {
             return (
@@ -701,6 +708,7 @@ pub async fn spawn_task(
                 conversation_history: None,
                 patch_data: None,
                 patch_base_sha: None,
+                local_only: contract.local_only,
             };
 
             if let Err(e) = state.send_daemon_command(daemon.id, cmd).await {
@@ -2074,6 +2082,7 @@ pub async fn resume_supervisor(
                 conversation_history: Some(supervisor_state.conversation_history.clone()), // Fallback if worktree missing
                 patch_data,
                 patch_base_sha,
+                local_only: contract.local_only,
             };
 
             if let Err(e) = state.send_daemon_command(target_daemon_id, command).await {