Audit of 9af1463

internal/agents/bash.go

@@ -8,10 +8,10 @@ import (
 	"os"
 	"os/exec"
 	"strings"
-	"syscall"
 	"time"
 
 	"g.fc.run/ai/byre/internal/mcp"
+	"g.fc.run/ai/byre/internal/procgroup"
 )
 
 const bashKeep = 64 << 10
@@ -68,13 +68,9 @@ func (m *Manager) bash(ctx context.Context, l *live, raw json.RawMessage) (strin
 
 	cctx, cancel := context.WithTimeout(ctx, timeout)
 	defer cancel()
-	cmd := exec.CommandContext(cctx, shell, "-l", "-c", args.Command)
+	cmd := procgroup.CommandContext(cctx, shell, "-l", "-c", args.Command)
 	cmd.Dir = l.dir
 	cmd.Env = append(os.Environ(), portEnv(task)...)
-	cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
-	cmd.Cancel = func() error {
-		return syscall.Kill(-cmd.Process.Pid, syscall.SIGKILL)
-	}
 	cmd.WaitDelay = 5 * time.Second
 	out := &tailWriter{}
 	cmd.Stdout = out

internal/agents/usage.go

@@ -8,13 +8,12 @@ import (
 	"log/slog"
 	"maps"
 	"os"
-	"os/exec"
 	"slices"
 	"strings"
-	"syscall"
 	"time"
 
 	"g.fc.run/ai/byre/internal/api"
+	"g.fc.run/ai/byre/internal/procgroup"
 )
 
 const usageTimeout = 10 * time.Second
@@ -127,11 +126,7 @@ func runUsageCommand(cmdline string) (api.Usage, error) {
 	}
 	ctx, cancel := context.WithTimeout(context.Background(), usageTimeout)
 	defer cancel()
-	cmd := exec.CommandContext(ctx, shell, "-l", "-c", cmdline)
-	cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
-	cmd.Cancel = func() error {
-		return syscall.Kill(-cmd.Process.Pid, syscall.SIGKILL)
-	}
+	cmd := procgroup.CommandContext(ctx, shell, "-l", "-c", cmdline)
 	cmd.WaitDelay = time.Second
 	out, err := cmd.Output()
 	if err != nil {