Simplify code found by simplicity audit of fa73b74

cmd/byre/clientexec.go

@@ -13,6 +13,7 @@ import (
 	"time"
 
 	"g.fc.run/ai/byre/internal/api"
+	"g.fc.run/ai/byre/internal/shell"
 )
 
 const (
@@ -36,7 +37,7 @@ func clientExecCmd(args []string) {
 
 	words := make([]string, fs.NArg())
 	for i, w := range fs.Args() {
-		words[i] = "'" + strings.ReplaceAll(w, "'", `'\''`) + "'"
+		words[i] = shell.Quote(w)
 	}
 	req := api.ClientExec{Command: strings.Join(words, " "), TimeoutMs: *timeout * 1000}
 	if *client != "" {

cmd/byre/main.go

@@ -20,8 +20,6 @@ func main() {
 		checkCmd()
 	case "install-tool":
 		installToolCmd(os.Args[2:])
-	case "run":
-		runCmd(os.Args[2:])
 	case "signing":
 		signingCmd(os.Args[2:])
 	case "grep":
@@ -38,7 +36,7 @@ func main() {
 }
 
 func usage() {
-	fmt.Fprintln(os.Stderr, "usage: byre serve | byre install | byre check | byre install-tool NAME | byre run [--resume ID] | byre signing CHECKOUT | byre grep [--glob GLOB] [--ignore-case] [--files-only] PATTERN PATH | byre list PATH | byre client-exec [--client NAME] [--timeout SECS] -- CMD... | byre screen")
+	fmt.Fprintln(os.Stderr, "usage: byre serve | byre install | byre check | byre install-tool NAME | byre signing CHECKOUT | byre grep [--glob GLOB] [--ignore-case] [--files-only] PATTERN PATH | byre list PATH | byre client-exec [--client NAME] [--timeout SECS] -- CMD... | byre screen")
 	os.Exit(2)
 }
 

cmd/byre/run.go

@@ -1,173 +0,0 @@
-package main
-
-import (
-	"bufio"
-	"context"
-	"encoding/json"
-	"flag"
-	"fmt"
-	"log/slog"
-	"os"
-	"os/exec"
-	"os/signal"
-	"strings"
-
-	"g.fc.run/ai/byre/internal/claude"
-	"g.fc.run/ai/byre/internal/git"
-)
-
-func runCmd(args []string) {
-	fs := flag.NewFlagSet("run", flag.ExitOnError)
-	resume := fs.String("resume", "", "claude session id to resume")
-	fs.Parse(args)
-
-	dir, err := os.Getwd()
-	if err != nil {
-		fatal("getwd", "err", err)
-	}
-
-	ctx := context.Background()
-	s, err := claude.Start(ctx, claude.Options{
-		Cwd:    dir,
-		Resume: *resume,
-		Env:    git.IdentityEnv(gitConfig(dir, "user.name"), gitConfig(dir, "user.email")),
-	})
-	if err != nil {
-		fatal("start claude", "err", err)
-	}
-
-	sigs := make(chan os.Signal, 1)
-	signal.Notify(sigs, os.Interrupt)
-
-	lines := make(chan string)
-	go readLines(lines)
-
-	for {
-		fmt.Print("> ")
-
-		select {
-		case line, ok := <-lines:
-			if !ok {
-				shutdown(s)
-				return
-			}
-			if strings.TrimSpace(line) == "" {
-				continue
-			}
-			err := s.Send(line)
-			if err != nil {
-				fatal("send", "err", err)
-			}
-			runTurn(ctx, s, sigs)
-
-		case <-sigs:
-			fmt.Println()
-			shutdown(s)
-			return
-		}
-	}
-}
-
-func runTurn(ctx context.Context, s *claude.Session, sigs <-chan os.Signal) {
-	for {
-		select {
-		case ev, ok := <-s.Events():
-			if !ok {
-				fatal("claude exited")
-			}
-			if printEvent(ev) {
-				return
-			}
-
-		case <-sigs:
-			fmt.Println("\n[interrupting]")
-			err := s.Interrupt(ctx)
-			if err != nil {
-				slog.Error("interrupt", "err", err)
-			}
-		}
-	}
-}
-
-func printEvent(ev claude.Event) bool {
-	switch {
-	case ev.Type == "system" && ev.Subtype == "init":
-		info := struct {
-			SessionID string `json:"session_id"`
-			Model     string `json:"model"`
-		}{}
-		err := json.Unmarshal(ev.Raw, &info)
-		if err != nil {
-			fatal("parse init", "err", err)
-		}
-		fmt.Printf("[session %s, %s]\n", info.SessionID, info.Model)
-
-	case ev.Type == "assistant":
-		blocks, err := ev.Blocks()
-		if err != nil {
-			fatal("parse assistant", "err", err)
-		}
-		for _, b := range blocks {
-			switch b.Type {
-			case "text":
-				fmt.Println(b.Text)
-			case "tool_use":
-				fmt.Printf("→ %s %s\n", b.Name, oneLine(string(b.Input), 160))
-			}
-		}
-
-	case ev.Type == "user":
-		blocks, err := ev.Blocks()
-		if err != nil {
-			fatal("parse user", "err", err)
-		}
-		for _, b := range blocks {
-			if b.Type == "tool_result" && b.IsError {
-				fmt.Printf("← error %s\n", oneLine(string(b.Content), 160))
-			}
-		}
-
-	case ev.Type == "result":
-		res, err := ev.Result()
-		if err != nil {
-			fatal("parse result", "err", err)
-		}
-		fmt.Printf("[%s, %d turns, %.1fs, $%.4f]\n", res.Subtype, res.NumTurns, float64(res.DurationMS)/1000, res.TotalCostUSD)
-		return true
-	}
-
-	return false
-}
-
-func readLines(out chan<- string) {
-	defer close(out)
-	sc := bufio.NewScanner(os.Stdin)
-	for sc.Scan() {
-		out <- sc.Text()
-	}
-}
-
-func shutdown(s *claude.Session) {
-	err := s.Close()
-	if err != nil {
-		slog.Warn("claude exit", "err", err)
-	}
-}
-
-func gitConfig(dir, key string) string {
-	cmd := exec.Command("git", "config", key)
-	cmd.Dir = dir
-	out, err := cmd.Output()
-	if err != nil {
-		fatal("git config", "key", key, "err", err)
-	}
-	return strings.TrimSpace(string(out))
-}
-
-func oneLine(s string, max int) string {
-	s = strings.Join(strings.Fields(s), " ")
-	if len(s) > max {
-		return s[:max] + "…"
-	}
-	return s
-}

cmd/byre/tool.go

@@ -7,6 +7,8 @@ import (
 	"path/filepath"
 	"strings"
 	"syscall"
+
+	"g.fc.run/ai/byre/internal/shell"
 )
 
 type brewTool struct {
@@ -75,7 +77,7 @@ func installCommand(name string) string {
 	if err != nil {
 		fatal("find executable", "err", err)
 	}
-	return "'" + strings.ReplaceAll(exe, "'", `'\''`) + "' install-tool " + name
+	return shell.Quote(exe) + " install-tool " + name
 }
 
 func codexHome() string {