Fixup: Without using kill on linux

Author: carlreid

src/StreamMaster.Streams/Factories/CommandExecutor.cs

@@ -148,7 +148,7 @@ private void GracefullyTerminateProcessInternal(Process? processToTerminate, ILo
         if (processToTerminate == null) { log.LogDebug("Terminate: Process is null."); return; }
 
         int processId = -1;
-        try { processId = processToTerminate.Id; } catch { /* Handle case where Id access fails */ }
+        try { processId = processToTerminate.Id; } catch { /* Handle */ }
 
         bool alreadyExited = false;
         try { alreadyExited = processToTerminate.HasExited; }
@@ -168,45 +168,35 @@ private void GracefullyTerminateProcessInternal(Process? processToTerminate, ILo
 
         try
         {
+            bool exitedAfterQ = false;
             if (processToTerminate.StartInfo.RedirectStandardInput)
             {
-                log.LogDebug("Terminate: Attempting to send 'q' to stdin for process {ProcessId}", processId);
                 try
                 {
+                    log.LogDebug("Terminate: Attempting to send 'q' to stdin for process {ProcessId}", processId);
                     processToTerminate.StandardInput.WriteLine("q");
                     processToTerminate.StandardInput.Close();
-
-                    if (processToTerminate.WaitForExit(1000))
+                    if (processToTerminate.WaitForExit(1000)) // Wait 1 second
                     {
                         log.LogInformation("Process {ProcessId} terminated gracefully after sending 'q'.", processId);
-                        return;
+                        exitedAfterQ = true;
                     }
-                    log.LogDebug("Terminate: Process {ProcessId} did not exit after sending 'q' and 1s wait.", processId);
-                }
-                catch (InvalidOperationException ioex)
-                {
-                    log.LogWarning(ioex, "Terminate: Error accessing StandardInput for process {ProcessId} (likely already closed/exited).", processId);
-                    if (processToTerminate.WaitForExit(50))
+                    else
                     {
-                        log.LogInformation("Process {ProcessId} terminated shortly after stdin error.", processId);
-                        return;
+                        log.LogDebug("Terminate: Process {ProcessId} did not exit after sending 'q' and 1s wait.", processId);
                     }
                 }
+                catch (Exception ex) when (ex is InvalidOperationException || ex is ObjectDisposedException)
+                {
+                    log.LogWarning(ex, "Terminate: Error accessing StandardInput for process {ProcessId} (likely already closed/exited).", processId);
+                    if (processToTerminate.WaitForExit(50)) exitedAfterQ = true; // Check again quickly
+                }
                 catch (Exception ex)
                 {
                     log.LogError(ex, "Terminate: Error sending 'q' to process {ProcessId}", processId);
                 }
             }
-            else
-            {
-                log.LogWarning("Terminate: Cannot send 'q' to process {ProcessId}, StandardInput not redirected.", processId);
-            }
-
-            if (processToTerminate.HasExited)
-            {
-                log.LogDebug("Terminate: Process {ProcessId} exited before signal attempt.", processId);
-                return;
-            }
+            if (exitedAfterQ) return;
 
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {
@@ -221,25 +211,24 @@ private void GracefullyTerminateProcessInternal(Process? processToTerminate, ILo
             }
             else
             {
-                log.LogDebug("Terminate: Sending SIGTERM to process {ProcessId}...", processId);
-                Process.Start("kill", $"-TERM {processToTerminate.Id}");
+                log.LogDebug("Terminate: Waiting up to 3s for process {ProcessId} to exit (Non-Windows)...", processId);
                 if (processToTerminate.WaitForExit(3000))
                 {
-                    log.LogInformation("Process {ProcessId} terminated after SIGTERM.", processId);
+                    log.LogInformation("Process {ProcessId} terminated gracefully after wait (Non-Windows).", processId);
                     return;
                 }
-                log.LogWarning("Process {ProcessId} did not terminate after SIGTERM, sending SIGKILL", processId);
+
+                log.LogWarning("Process {ProcessId} did not terminate after wait, forcing kill (Non-Windows)", processId);
                 if (!processToTerminate.HasExited)
                 {
-                    log.LogDebug("Terminate: Sending SIGKILL to process {ProcessId}...", processId);
-                    Process.Start("kill", $"-KILL {processToTerminate.Id}");
+                    processToTerminate.Kill(true);
                     processToTerminate.WaitForExit(500);
                 }
             }
         }
         catch (Exception ex)
         {
-            log.LogError(ex, "Error during signal/kill phase for process {ProcessId}", processId);
+            log.LogError(ex, "Error during termination phase for process {ProcessId}", processId);
             try
             {
                 if (!processToTerminate.HasExited)