2 files changed, 60 insertions, 12 deletions

diff --git a/makima/src/server/handlers/mesh_daemon.rs b/makima/src/server/handlers/mesh_daemon.rs
index 270118f..0ba37d2 100644
--- a/makima/src/server/handlers/mesh_daemon.rs
+++ b/makima/src/server/handlers/mesh_daemon.rs
@@ -1665,8 +1665,8 @@ async fn handle_daemon_connection(socket: WebSocket, state: SharedState, auth_re
                                 task_id,
                                 success,
                                 message,
-                                commit_sha: _,
-                                conflicts: _,
+                                commit_sha,
+                                conflicts,
                             }) => {
                                 tracing::info!(
                                     task_id = %task_id,
@@ -1674,6 +1674,15 @@ async fn handle_daemon_connection(socket: WebSocket, state: SharedState, auth_re
                                     "Merge to target result received"
                                 );
 
+                                // Broadcast the merge result for waiting handlers
+                                state.broadcast_merge_result(crate::server::state::MergeResultNotification {
+                                    task_id,
+                                    success,
+                                    message: message.clone(),
+                                    commit_sha: commit_sha.clone(),
+                                    conflicts: conflicts.clone(),
+                                });
+
                                 // On successful merge, notify supervisor to check if all merges complete
                                 if success {
                                     if let Some(pool) = state.db_pool.as_ref() {
diff --git a/makima/src/server/handlers/mesh_supervisor.rs b/makima/src/server/handlers/mesh_supervisor.rs
index 1b476ef..d1a1a99 100644
--- a/makima/src/server/handlers/mesh_supervisor.rs
+++ b/makima/src/server/handlers/mesh_supervisor.rs
@@ -1349,6 +1349,9 @@ pub async fn merge_task(
         ).into_response();
     };
 
+    // Subscribe to merge results BEFORE sending the command
+    let mut rx = state.merge_results.subscribe();
+
     // Send MergeTaskToTarget command to daemon
     let cmd = DaemonCommand::MergeTaskToTarget {
         task_id,
@@ -1364,16 +1367,52 @@ pub async fn merge_task(
         ).into_response();
     }
 
-    (
-        StatusCode::OK,
-        Json(MergeTaskResponse {
-            task_id,
-            success: true,
-            message: "Merge command sent".to_string(),
-            commit_sha: None,
-            conflicts: None,
-        }),
-    ).into_response()
+    // Wait for the merge result with a timeout (60 seconds should be plenty for a merge)
+    let timeout = tokio::time::Duration::from_secs(60);
+    let result = tokio::time::timeout(timeout, async {
+        loop {
+            match rx.recv().await {
+                Ok(notification) => {
+                    if notification.task_id == task_id {
+                        return Some(notification);
+                    }
+                    // Not our task, keep waiting
+                }
+                Err(_) => {
+                    // Channel closed or lagged
+                    return None;
+                }
+            }
+        }
+    }).await;
+
+    match result {
+        Ok(Some(notification)) => {
+            (
+                StatusCode::OK,
+                Json(MergeTaskResponse {
+                    task_id,
+                    success: notification.success,
+                    message: notification.message,
+                    commit_sha: notification.commit_sha,
+                    conflicts: notification.conflicts,
+                }),
+            ).into_response()
+        }
+        Ok(None) | Err(_) => {
+            // Timeout or channel error - return error status
+            (
+                StatusCode::GATEWAY_TIMEOUT,
+                Json(MergeTaskResponse {
+                    task_id,
+                    success: false,
+                    message: "Merge operation timed out waiting for daemon response".to_string(),
+                    commit_sha: None,
+                    conflicts: None,
+                }),
+            ).into_response()
+        }
+    }
 }
 
 /// Create a pull request for a task's changes.