Merge pull request #75 from dispatchrun/signal-handling

run: fix signal handling

Author: chriso

cli/run.go

@@ -16,6 +16,7 @@ import (
 	"os/exec"
 	"os/signal"
 	"path/filepath"
+	"runtime"
 	"slices"
 	"strconv"
 	"strings"
@@ -197,12 +198,16 @@ Run 'dispatch help run' to learn about Dispatch sessions.`, BridgeSession)
 					select {
 					case <-ctx.Done():
 						return
-					case <-signals:
+					case s := <-signals:
 						if !signaled {
 							signaled = true
-							_ = cmd.Process.Signal(syscall.SIGTERM)
 						} else {
-							_ = cmd.Process.Kill()
+							s = os.Kill
+						}
+						if cmd.Process != nil && cmd.Process.Pid > 0 {
+							// Sending the signal to -pid sends it to all processes
+							// in the process group.
+							_ = syscall.Kill(-cmd.Process.Pid, s.(syscall.Signal))
 						}
 					}
 				}
@@ -282,6 +287,9 @@ Run 'dispatch help run' to learn about Dispatch sessions.`, BridgeSession)
 				}
 			})
 
+			runtime.LockOSThread()
+			defer runtime.UnlockOSThread()
+
 			if err = cmd.Start(); err != nil {
 				return fmt.Errorf("failed to start %s: %v", strings.Join(args, " "), err)
 			}

cli/run_darwin.go

@@ -0,0 +1,7 @@
+package cli
+
+import "syscall"
+
+func setSysProcAttr(attr *syscall.SysProcAttr) {
+	attr.Setpgid = true
+}

cli/run_default.go

@@ -1,4 +1,4 @@
-//go:build !linux
+//go:build !linux && !darwin
 
 package cli