1 files changed, 17 insertions, 0 deletions
diff --git a/makima/src/server/handlers/mesh_daemon.rs b/makima/src/server/handlers/mesh_daemon.rs
index 139db70..e5f0a81 100644
--- a/makima/src/server/handlers/mesh_daemon.rs
+++ b/makima/src/server/handlers/mesh_daemon.rs
@@ -2488,6 +2488,23 @@ async fn handle_daemon_connection(socket: WebSocket, state: SharedState, auth_re
                                     }
                                 }
                             }
+                            Ok(DaemonMessage::WorktreeDiffResult { task_id, success, diff, error }) => {
+                                tracing::debug!(
+                                    task_id = %task_id,
+                                    success = success,
+                                    "Worktree diff result received"
+                                );
+
+                                // Fulfill pending worktree diff request if any
+                                if let Some((_, tx)) = state.pending_worktree_diff.remove(&task_id) {
+                                    let _ = tx.send(crate::server::state::WorktreeDiffResponse {
+                                        task_id,
+                                        success,
+                                        diff: diff.unwrap_or_default(),
+                                        error,
+                                    });
+                                }
+                            }
                             Err(e) => {
                                 tracing::warn!("Failed to parse daemon message: {}", e);
                             }