Towards clean shutdown

Author: terhechte

src/main.rs

@@ -12,6 +12,7 @@ use crate::ui::App;
 use anyhow::Result;
 use context::Context as ContextType;
 use mcp::run_server;
+use tokio::signal;
 use tracing::{error, info};
 use tracing_subscriber::{
     EnvFilter, Layer, fmt::format::PrettyFields, layer::SubscriberExt, util::SubscriberInitExt,
@@ -43,42 +44,71 @@ async fn main() -> Result<()> {
 
     // Run the MCP Server
     let cloned_context = context.clone();
-    tokio::spawn(async move {
+    let server_handle = tokio::spawn(async move {
         run_server(cloned_context).await.unwrap();
     });
 
-    if no_ui {
-        info!(
-            "Running in CLI mode on port {}:{}",
-            context.address_information().0,
-            context.address_information().1
-        );
-        info!("Configuration file: {}", context.configuration_file());
-        if context.project_descriptions().await.is_empty() {
-            error!("No projects found, please run without `--no-ui` or edit configuration file");
-            return Ok(());
+    let main_loop_fut = async {
+        if no_ui {
+            info!(
+                "Running in CLI mode on port {}:{}",
+                context.address_information().0,
+                context.address_information().1
+            );
+            info!("Configuration file: {}", context.configuration_file());
+            if context.project_descriptions().await.is_empty() {
+                error!(
+                    "No projects found, please run without `--no-ui` or edit configuration file"
+                );
+                return Ok(()); // Early return for no projects in CLI mode
+            }
+            info!(
+                "Cursor mcp json (project/.cursor.mcp.json):\n```json\n{}\n```",
+                context.mcp_configuration()
+            );
+            // Keep the CLI mode running indefinitely until Ctrl+C
+            loop {
+                while let Ok(notification) = receiver.try_recv() {
+                    info!("  {}", notification.description());
+                }
+                // Add a small sleep to avoid busy-waiting if desired, or just rely on Ctrl+C
+                tokio::time::sleep(tokio::time::Duration::from_millis(100)).await;
+            }
+            // Note: This loop will now only exit via Ctrl+C handled by tokio::select!
+        } else {
+            let project_descriptions = context.project_descriptions().await;
+            // run_ui blocks, so we need to handle its potential error
+            run_ui(context, receiver, project_descriptions)
         }
-        info!(
-            "Cursor mcp json (project/.cursor.mcp.json):\n```json\n{}\n```",
-            context.mcp_configuration()
-        );
-        loop {
-            while let Ok(notification) = receiver.try_recv() {
-                info!("  {}", notification.description());
+    };
+
+    tokio::select! {
+        res = main_loop_fut => {
+            if let Err(e) = res {
+                error!("Main loop finished with error: {}", e);
+            } else {
+                info!("Main loop finished normally.");
             }
+        },
+        _ = signal::ctrl_c() => {
+            info!("Ctrl+C received, shutting down...");
+        }
+        _ = server_handle => {
+             info!("Server task finished unexpectedly.");
         }
-    } else {
-        run_ui(context, receiver)?;
     }
 
-    final_context.shutdown_all().await;
+    if no_ui {
+        final_context.shutdown_all().await;
+    }
 
     Ok(())
 }
 
 fn run_ui(
     context: context::Context,
     receiver: flume::Receiver<context::ContextNotification>,
+    project_descriptions: Vec<ui::ProjectDescription>,
 ) -> Result<()> {
     // Configure eframe options (window title, size, etc.)
     let options = eframe::NativeOptions {
@@ -88,7 +118,7 @@ fn run_ui(
         ..Default::default()
     };
 
-    let app = App::new(context, receiver);
+    let app = App::new(context, receiver, project_descriptions);
 
     eframe::run_native(
         "Cursor Rust Tools",