Revert "(fix): Remove double-kill bug in Windows process termination (#777) (…" (#857)

This reverts commit c206647.

Author: xiantang

runner/util_windows.go

@@ -1,78 +1,53 @@
-//go:build windows
-
 package runner
 
 import (
-	"fmt"
 	"io"
 	"os"
 	"os/exec"
 	"strconv"
 	"strings"
-	"syscall"
+	"time"
 )
 
 func (e *Engine) killCmd(cmd *exec.Cmd) (pid int, err error) {
 	pid = cmd.Process.Pid
+	// https://stackoverflow.com/a/44551450
+	kill := exec.Command("TASKKILL", "/T", "/F", "/PID", strconv.Itoa(pid))
 
-	// On Windows, SIGINT is not supported for process trees.
-	// Windows uses different process termination mechanisms than Unix.
-	// TASKKILL is the proper way to terminate process hierarchies on Windows.
 	if e.config.Build.SendInterrupt {
-		e.mainLog("send_interrupt is not supported on Windows, using TASKKILL instead")
-	}
-
-	// Use TASKKILL to forcefully terminate the entire process tree
-	e.mainDebug("sending TASKKILL to process tree")
-	killCmd := exec.Command("TASKKILL", "/F", "/T", "/PID", strconv.Itoa(pid))
-
-	// Hide the console window for cleaner UX
-	killCmd.SysProcAttr = &syscall.SysProcAttr{
-		HideWindow:    true,
-		CreationFlags: 0x08000000, // CREATE_NO_WINDOW
+		if err = kill.Run(); err != nil {
+			return
+		}
+		time.Sleep(e.config.killDelay())
 	}
-
-	err = killCmd.Run()
-
-	// Wait for the process to fully terminate and release resources
+	err = kill.Run()
+	// Wait releases any resources associated with the Process.
 	_, _ = cmd.Process.Wait()
-
 	return pid, err
 }
 
 func (e *Engine) startCmd(cmd string) (*exec.Cmd, io.ReadCloser, io.ReadCloser, error) {
 	var err error
 
-	if !strings.Contains(cmd, ".exe") && !strings.Contains(cmd, ".bat") && !strings.Contains(cmd, ".cmd") {
-		e.mainDebug("command may not be recognized as executable: %s", cmd)
+	if !strings.Contains(cmd, ".exe") {
+		e.runnerLog("CMD will not recognize non .exe file for execution, path: %s", cmd)
 	}
-
-	// Use cmd.exe instead of PowerShell for better performance
-	c := exec.Command("cmd", "/C", cmd)
-
-	// Hide the console window
-	c.SysProcAttr = &syscall.SysProcAttr{
-		HideWindow:    true,
-		CreationFlags: 0x08000000, // CREATE_NO_WINDOW
-	}
-
+	c := exec.Command("powershell", cmd)
 	stderr, err := c.StderrPipe()
 	if err != nil {
-		return nil, nil, nil, fmt.Errorf("failed to create stderr pipe: %w", err)
+		return nil, nil, nil, err
 	}
-
 	stdout, err := c.StdoutPipe()
 	if err != nil {
-		return nil, nil, nil, fmt.Errorf("failed to create stdout pipe: %w", err)
+		return nil, nil, nil, err
 	}
 
 	c.Stdout = os.Stdout
 	c.Stderr = os.Stderr
 
 	err = c.Start()
 	if err != nil {
-		return nil, nil, nil, fmt.Errorf("failed to start command: %w", err)
+		return nil, nil, nil, err
 	}
-
-	return c, stdout, stderr, nil
+	return c, stdout, stderr, err
 }