From 7e8ce0189fcc6873a72e0c4d3357c0412e7f9dd5 Mon Sep 17 00:00:00 2001
From: Ben Lovell <ben.j.lovell@gmail.com>
Date: Thu, 11 Dec 2025 16:57:01 +0100
Subject: [PATCH] fix: enable Ctrl-C in local runs

---
 crates/tower-cmd/src/run.rs | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/crates/tower-cmd/src/run.rs b/crates/tower-cmd/src/run.rs
index 7bee38d5..f40517d0 100644
--- a/crates/tower-cmd/src/run.rs
+++ b/crates/tower-cmd/src/run.rs
@@ -8,9 +8,11 @@ use tower_package::{Package, PackageSpec};
 use tower_runtime::{local::LocalApp, App, AppLauncher, OutputReceiver, Status};
 use tower_telemetry::{debug, Context};
 
+use std::sync::Arc;
 use tokio::sync::{
     mpsc::{unbounded_channel, Receiver as MpscReceiver},
     oneshot::{self, Receiver as OneshotReceiver},
+    Mutex,
 };
 use tokio::time::{sleep, timeout, Duration};
 
@@ -166,12 +168,19 @@ where
         .await?;
 
     // Monitor app output and status concurrently
-    let app = launcher.app.unwrap();
-    let status_task = tokio::spawn(monitor_local_status(app));
-
-    // Wait for both tasks to complete
+    let app = Arc::new(Mutex::new(launcher.app.unwrap()));
+    let status_task = tokio::spawn(monitor_local_status(Arc::clone(&app)));
+
+    // Wait for app to complete or SIGTERM
+    let status_result = tokio::select! {
+        status = status_task => status.unwrap(),
+        _ = tokio::signal::ctrl_c(), if !output::get_output_mode().is_mcp() => {
+            output::write("\nReceived Ctrl+C, stopping local run...\n");
+            app.lock().await.terminate().await.ok();
+            return Ok(output_task.await.unwrap());
+        }
+    };
     let final_result = output_task.await.unwrap();
-    let status_result = status_task.await.unwrap();
 
     // And if we crashed, err out
     match status_result {
@@ -548,7 +557,7 @@ async fn monitor_output(mut output: OutputReceiver) {
 
 /// monitor_local_status is a helper function that will monitor the status of a given app and waits for
 /// it to progress to a terminal state.
-async fn monitor_local_status(app: LocalApp) -> Status {
+async fn monitor_local_status(app: Arc<Mutex<LocalApp>>) -> Status {
     debug!("Starting status monitoring for LocalApp");
     let mut check_count = 0;
     let mut err_count = 0;
@@ -561,7 +570,7 @@ async fn monitor_local_status(app: LocalApp) -> Status {
             check_count
         );
 
-        match app.status().await {
+        match app.lock().await.status().await {
             Ok(status) => {
                 // We reset the error count to indicate that we can intermittently get statuses.
                 err_count = 0;