Merge pull request #13 from 0xtbug/dev

Merge from dev

Author: 0xtbug

src-tauri/src/commands/cli_proxy.rs

@@ -66,11 +66,10 @@ pub async fn stop_cli_proxy() -> CommandResult<()> {
         .map_err(|e| CommandError::General(e.to_string()))?;
 
     if let Some(ref mut child) = *guard {
-        let pid = child.id();
-
         // On Windows, use taskkill for reliable termination
         #[cfg(windows)]
         {
+            let pid = child.id();
             let _ = Command::new("taskkill")
                 .args(["/F", "/T", "/PID", &pid.to_string()])
                 .creation_flags(CREATE_NO_WINDOW)
@@ -102,6 +101,14 @@ pub async fn stop_cli_proxy() -> CommandResult<()> {
                         .creation_flags(CREATE_NO_WINDOW)
                         .output();
                 }
+
+                #[cfg(not(windows))]
+                {
+                    use std::process::Command;
+                    let _ = Command::new("pkill")
+                        .args(["-f", name])
+                        .output();
+                }
             }
         }
         *name_guard = None;

src-tauri/src/lib.rs

@@ -14,14 +14,13 @@ fn cleanup_on_exit() {
     // Kill any running CLI proxy process
     if let Ok(mut guard) = state::CLI_PROXY_PROCESS.lock() {
         if let Some(ref mut child) = *guard {
-            let pid = child.id();
-
             #[cfg(windows)]
             {
                 use std::process::Command;
                 use std::os::windows::process::CommandExt;
                 const CREATE_NO_WINDOW: u32 = 0x08000000;
 
+                let pid = child.id();
                 let _ = Command::new("taskkill")
                     .args(["/F", "/T", "/PID", &pid.to_string()])
                     .creation_flags(CREATE_NO_WINDOW)
@@ -54,6 +53,14 @@ fn cleanup_on_exit() {
                         .creation_flags(CREATE_NO_WINDOW)
                         .output();
                 }
+
+                #[cfg(not(windows))]
+                {
+                    use std::process::Command;
+                    let _ = Command::new("pkill")
+                        .args(["-f", name])
+                        .output();
+                }
             }
         }
         *name_guard = None;