1 files changed, 6 insertions, 0 deletions
diff --git a/makima/src/bin/makima.rs b/makima/src/bin/makima.rs
index 35783dc..5c71885 100644
--- a/makima/src/bin/makima.rs
+++ b/makima/src/bin/makima.rs
@@ -219,6 +219,12 @@ async fn run_daemon(
         }
     }
 
+    // Gracefully shutdown all running Claude processes
+    eprintln!("Terminating Claude processes...");
+    task_manager
+        .shutdown_all_processes(std::time::Duration::from_secs(5))
+        .await;
+
     // Cleanup
     tracing::info!("Daemon stopped");