@@ -5,8 +5,8 @@ package autobuilder
 import (
 	"log"
 	"os"
-	"os/exec"
 
+	"github.com/github/codeql-go/extractor/registries"
 	"github.com/github/codeql-go/extractor/util"
 )
 
@@ -68,7 +68,7 @@ func tryBuildIfExists(buildFile, cmd string, args ...string) (scriptSuccess bool
 // tryBuild tries to run `cmd args...`, returning true if successful and false if not.
 func tryBuild(cmd string, args ...string) bool {
 	log.Printf("Trying build command %s %v", cmd, args)
-	res := util.RunCmd(exec.Command(cmd, args...))
+	res := registries.Command(cmd, args...).RunCmd()
 	return res && (!CheckExtracted || checkExtractorRun())
 }
 
 
@@ -69,7 +69,7 @@ func restoreRepoLayout(fromDir string, dirEntries []string, scratchDirName strin
 // addVersionToMod add a go version directive, e.g. `go 1.14` to a `go.mod` file.
 func addVersionToMod(version string) bool {
 	cmd := toolchain.GoCommand("mod", "edit", "-go="+version)
-	return util.RunCmd(cmd)
+	return cmd.RunCmd()
 }
 
 // checkVendor tests to see whether a vendor directory is inconsistent according to the go frontend
@@ -170,7 +170,7 @@ func tryUpdateGoModAndGoSum(workspace project.GoWorkspace) {
 
 			// run `go mod tidy -e`
 			cmd := goMod.Tidy()
-			res := util.RunCmd(cmd)
+			res := cmd.RunCmd()
 
 			if !res {
 				log.Printf("Failed to run `go mod tidy -e` in %s\n", goModDir)
@@ -436,13 +436,13 @@ func installDependencies(workspace project.GoWorkspace) {
 			if util.DirExists(filepath.Join(path, "vendor")) {
 				vendor := module.Vendor()
 				log.Printf("Synchronizing vendor file using `go mod vendor` in %s.\n", path)
-				util.RunCmd(vendor)
+				vendor.RunCmd()
 			}
 
-			install = toolchain.GoCommand("get", "-v", "./...")
-			install.Dir = path
+			goGet := toolchain.GoCommand("get", "-v", "./...")
+			goGet.SetDir(path)
 			log.Printf("Installing dependencies using `go get -v ./...` in `%s`.\n", path)
-			util.RunCmd(install)
+			goGet.RunCmd()
 		}
 	}
 }
 
@@ -3,14 +3,14 @@ package project
 import (
 	"log"
 	"os"
-	"os/exec"
 	"path/filepath"
 	"regexp"
 	"slices"
 	"sort"
 	"strings"
 
 	"github.com/github/codeql-go/extractor/diagnostics"
+	"github.com/github/codeql-go/extractor/registries"
 	"github.com/github/codeql-go/extractor/toolchain"
 	"github.com/github/codeql-go/extractor/util"
 	"golang.org/x/mod/modfile"
@@ -49,12 +49,12 @@ func (module *GoModule) RequiredGoVersion() util.SemVer {
 }
 
 // Runs `go mod tidy` for this module.
-func (module *GoModule) Tidy() *exec.Cmd {
+func (module *GoModule) Tidy() *registries.ProxiedCmd {
 	return toolchain.TidyModule(filepath.Dir(module.Path))
 }
 
 // Runs `go mod vendor -e` for this module.
-func (module *GoModule) Vendor() *exec.Cmd {
+func (module *GoModule) Vendor() *registries.ProxiedCmd {
 	return toolchain.VendorModule(filepath.Dir(module.Path))
 }
 
@@ -149,7 +149,7 @@ func InitGoModForLegacyProject(path string) {
 
 	modInit := toolchain.InitModule(path)
 
-	if !util.RunCmd(modInit) {
+	if !modInit.RunCmd() {
 		log.Printf("Failed to initialize go.mod file for this project.")
 		return
 	}
 
@@ -48,7 +48,7 @@ func GetEnvGoVersion() string {
 		// Go version in tests and also allows users to override the system default more generally.
 		_, hasToolchainVar := os.LookupEnv("GOTOOLCHAIN")
 		if !hasToolchainVar {
-			cmd.Env = append(os.Environ(), "GOTOOLCHAIN=local")
+			cmd.AppendEnv("GOTOOLCHAIN=local")
 		}
 
 		out, err := cmd.CombinedOutput()
@@ -82,10 +82,10 @@ func InstallVersion(workingDir string, version util.SemVer) bool {
 	// should then work even with an invalid version that's still in `go.mod`
 	toolchainArg := "GOTOOLCHAIN=go" + version.String()[1:]
 	versionCmd := Version()
-	versionCmd.Dir = workingDir
-	versionCmd.Env = append(os.Environ(), toolchainArg)
-	versionCmd.Stdout = os.Stdout
-	versionCmd.Stderr = os.Stderr
+	versionCmd.SetDir(workingDir)
+	versionCmd.AppendEnv(toolchainArg)
+	versionCmd.SetStdout(os.Stdout)
+	versionCmd.SetStderr(os.Stderr)
 
 	log.Printf(
 		"Trying to install Go %s using its canonical representation in `%s`.",
@@ -99,7 +99,7 @@ func InstallVersion(workingDir string, version util.SemVer) bool {
 		log.Printf(
 			"Failed to invoke `%s go version` in %s: %s\n",
 			toolchainArg,
-			versionCmd.Dir,
+			workingDir,
 			versionErr.Error(),
 		)
 
@@ -145,21 +145,20 @@ func SupportsWorkspaces() bool {
 }
 
 // Constructs a `*exec.Cmd` for `go` with the specified arguments.
-func GoCommand(arg ...string) *exec.Cmd {
-	cmd := exec.Command("go", arg...)
-	registries.ApplyProxyEnvVars(cmd)
+func GoCommand(arg ...string) *registries.ProxiedCmd {
+	cmd := registries.Command("go", arg...)
 	return cmd
 }
 
 // Run `go mod tidy -e` in the directory given by `path`.
-func TidyModule(path string) *exec.Cmd {
+func TidyModule(path string) *registries.ProxiedCmd {
 	cmd := GoCommand("mod", "tidy", "-e")
-	cmd.Dir = path
+	cmd.SetDir(path)
 	return cmd
 }
 
 // Run `go mod init` in the directory given by `path`.
-func InitModule(path string) *exec.Cmd {
+func InitModule(path string) *registries.ProxiedCmd {
 	moduleName := "codeql/auto-project"
 
 	if importpath := util.GetImportPath(); importpath != "" {
@@ -174,19 +173,19 @@ func InitModule(path string) *exec.Cmd {
 	}
 
 	modInit := GoCommand("mod", "init", moduleName)
-	modInit.Dir = path
+	modInit.SetDir(path)
 	return modInit
 }
 
 // Constructs a command to run `go mod vendor -e` in the directory given by `path`.
-func VendorModule(path string) *exec.Cmd {
+func VendorModule(path string) *registries.ProxiedCmd {
 	modVendor := GoCommand("mod", "vendor", "-e")
-	modVendor.Dir = path
+	modVendor.SetDir(path)
 	return modVendor
 }
 
 // Constructs a command to run `go version`.
-func Version() *exec.Cmd {
+func Version() *registries.ProxiedCmd {
 	version := GoCommand("version")
 	return version
 }
@@ -197,7 +196,7 @@ func RunList(format string, patterns []string, flags ...string) (string, error)
 }
 
 // Constructs a `go list` command with `format`, `patterns`, and `flags` for the respective inputs.
-func List(format string, patterns []string, flags ...string) *exec.Cmd {
+func List(format string, patterns []string, flags ...string) *registries.ProxiedCmd {
 	return ListWithEnv(format, patterns, nil, flags...)
 }
 
@@ -220,11 +219,11 @@ func RunListWithEnv(format string, patterns []string, additionalEnv []string, fl
 
 // Constructs a `go list` command with `format`, `patterns`, and `flags` for the respective inputs
 // and the extra environment variables given by `additionalEnv`.
-func ListWithEnv(format string, patterns []string, additionalEnv []string, flags ...string) *exec.Cmd {
+func ListWithEnv(format string, patterns []string, additionalEnv []string, flags ...string) *registries.ProxiedCmd {
 	args := append([]string{"list", "-e", "-f", format}, flags...)
 	args = append(args, patterns...)
 	cmd := GoCommand(args...)
-	cmd.Env = append(os.Environ(), additionalEnv...)
+	cmd.AppendEnv(additionalEnv...)
 	return cmd
 }