Simplify summary provider CLI execution

Author: peyton-alt

cmd/entire/cli/agent/claudecode/generate.go

@@ -1,14 +1,12 @@
 package claudecode
 
 import (
-	"bytes"
 	"context"
 	"encoding/json"
-	"errors"
 	"fmt"
-	"os"
 	"os/exec"
-	"strings"
+
+	"github.com/entireio/cli/cmd/entire/cli/agent"
 )
 
 // GenerateText sends a prompt to the Claude CLI and returns the raw text response.
@@ -21,52 +19,22 @@ func (c *ClaudeCodeAgent) GenerateText(ctx context.Context, prompt string, model
 		model = "haiku"
 	}
 
-	cmd := exec.CommandContext(ctx, claudePath,
+	args := []string{
 		"--print", "--output-format", "json",
-		"--model", model, "--setting-sources", "")
-
-	// Isolate from the user's git repo to prevent recursive hook triggers
-	// and index pollution (same approach as summarize/claude.go).
-	cmd.Dir = os.TempDir()
-	cmd.Env = stripGitEnv(os.Environ())
-	cmd.Stdin = strings.NewReader(prompt)
-
-	var stdout, stderr bytes.Buffer
-	cmd.Stdout = &stdout
-	cmd.Stderr = &stderr
-
-	if err := cmd.Run(); err != nil {
-		var execErr *exec.Error
-		if errors.As(err, &execErr) {
-			return "", fmt.Errorf("claude CLI not found: %w", err)
-		}
-		var exitErr *exec.ExitError
-		if errors.As(err, &exitErr) {
-			return "", fmt.Errorf("claude CLI failed (exit %d): %s", exitErr.ExitCode(), stderr.String())
-		}
-		return "", fmt.Errorf("failed to run claude CLI: %w", err)
+		"--model", model, "--setting-sources", "",
+	}
+	stdoutText, err := agent.RunIsolatedTextGeneratorCLI(ctx, exec.CommandContext, claudePath, "claude", args, prompt)
+	if err != nil {
+		return "", fmt.Errorf("claude text generation failed: %w", err)
 	}
 
 	// Parse the {"result": "..."} envelope
 	var response struct {
 		Result string `json:"result"`
 	}
-	if err := json.Unmarshal(stdout.Bytes(), &response); err != nil {
+	if err := json.Unmarshal([]byte(stdoutText), &response); err != nil {
 		return "", fmt.Errorf("failed to parse claude CLI response: %w", err)
 	}
 
 	return response.Result, nil
 }
-
-// stripGitEnv returns a copy of env with all GIT_* variables removed.
-// This prevents a subprocess from discovering or modifying the parent's git repo.
-// Duplicated from summarize/claude.go — simple filter not worth extracting to shared package.
-func stripGitEnv(env []string) []string {
-	filtered := make([]string, 0, len(env))
-	for _, e := range env {
-		if !strings.HasPrefix(e, "GIT_") {
-			filtered = append(filtered, e)
-		}
-	}
-	return filtered
-}

cmd/entire/cli/agent/codex/generate.go

@@ -1,55 +1,26 @@
 package codex
 
 import (
-	"bytes"
 	"context"
-	"errors"
 	"fmt"
-	"os"
 	"os/exec"
-	"strings"
+
+	"github.com/entireio/cli/cmd/entire/cli/agent"
 )
 
 var codexCommandRunner = exec.CommandContext
 
 // GenerateText sends a prompt to the Codex CLI and returns the raw text response.
 func (c *CodexAgent) GenerateText(ctx context.Context, prompt string, model string) (string, error) {
-	args := []string{"exec"}
+	args := []string{"exec", "--skip-git-repo-check"}
 	if model != "" {
 		args = append(args, "--model", model)
 	}
 	args = append(args, "-")
 
-	cmd := codexCommandRunner(ctx, "codex", args...)
-	cmd.Dir = os.TempDir()
-	cmd.Env = stripGitEnv(os.Environ())
-	cmd.Stdin = strings.NewReader(prompt)
-
-	var stdout, stderr bytes.Buffer
-	cmd.Stdout = &stdout
-	cmd.Stderr = &stderr
-
-	if err := cmd.Run(); err != nil {
-		var execErr *exec.Error
-		if errors.As(err, &execErr) {
-			return "", fmt.Errorf("codex CLI not found: %w", err)
-		}
-		var exitErr *exec.ExitError
-		if errors.As(err, &exitErr) {
-			return "", fmt.Errorf("codex CLI failed (exit %d): %s", exitErr.ExitCode(), stderr.String())
-		}
-		return "", fmt.Errorf("failed to run codex CLI: %w", err)
-	}
-
-	return strings.TrimSpace(stdout.String()), nil
-}
-
-func stripGitEnv(env []string) []string {
-	filtered := make([]string, 0, len(env))
-	for _, e := range env {
-		if !strings.HasPrefix(e, "GIT_") {
-			filtered = append(filtered, e)
-		}
+	result, err := agent.RunIsolatedTextGeneratorCLI(ctx, codexCommandRunner, "codex", "codex", args, prompt)
+	if err != nil {
+		return "", fmt.Errorf("codex text generation failed: %w", err)
 	}
-	return filtered
+	return result, nil
 }

cmd/entire/cli/agent/copilotcli/generate.go

@@ -1,13 +1,11 @@
 package copilotcli
 
 import (
-	"bytes"
 	"context"
-	"errors"
 	"fmt"
-	"os"
 	"os/exec"
-	"strings"
+
+	"github.com/entireio/cli/cmd/entire/cli/agent"
 )
 
 var copilotCommandRunner = exec.CommandContext
@@ -19,35 +17,9 @@ func (c *CopilotCLIAgent) GenerateText(ctx context.Context, prompt string, model
 		args = append(args, "--model", model)
 	}
 
-	cmd := copilotCommandRunner(ctx, "copilot", args...)
-	cmd.Dir = os.TempDir()
-	cmd.Env = stripGitEnv(os.Environ())
-
-	var stdout, stderr bytes.Buffer
-	cmd.Stdout = &stdout
-	cmd.Stderr = &stderr
-
-	if err := cmd.Run(); err != nil {
-		var execErr *exec.Error
-		if errors.As(err, &execErr) {
-			return "", fmt.Errorf("copilot CLI not found: %w", err)
-		}
-		var exitErr *exec.ExitError
-		if errors.As(err, &exitErr) {
-			return "", fmt.Errorf("copilot CLI failed (exit %d): %s", exitErr.ExitCode(), stderr.String())
-		}
-		return "", fmt.Errorf("failed to run copilot CLI: %w", err)
-	}
-
-	return strings.TrimSpace(stdout.String()), nil
-}
-
-func stripGitEnv(env []string) []string {
-	filtered := make([]string, 0, len(env))
-	for _, e := range env {
-		if !strings.HasPrefix(e, "GIT_") {
-			filtered = append(filtered, e)
-		}
+	result, err := agent.RunIsolatedTextGeneratorCLI(ctx, copilotCommandRunner, "copilot", "copilot", args, "")
+	if err != nil {
+		return "", fmt.Errorf("copilot text generation failed: %w", err)
 	}
-	return filtered
+	return result, nil
 }

cmd/entire/cli/agent/cursor/generate.go

@@ -1,13 +1,12 @@
 package cursor
 
 import (
-	"bytes"
 	"context"
-	"errors"
 	"fmt"
 	"os"
 	"os/exec"
-	"strings"
+
+	"github.com/entireio/cli/cmd/entire/cli/agent"
 )
 
 var cursorCommandRunner = exec.CommandContext
@@ -19,35 +18,9 @@ func (c *CursorAgent) GenerateText(ctx context.Context, prompt string, model str
 		args = append(args, "--model", model)
 	}
 
-	cmd := cursorCommandRunner(ctx, "agent", args...)
-	cmd.Dir = os.TempDir()
-	cmd.Env = stripGitEnv(os.Environ())
-
-	var stdout, stderr bytes.Buffer
-	cmd.Stdout = &stdout
-	cmd.Stderr = &stderr
-
-	if err := cmd.Run(); err != nil {
-		var execErr *exec.Error
-		if errors.As(err, &execErr) {
-			return "", fmt.Errorf("cursor CLI not found: %w", err)
-		}
-		var exitErr *exec.ExitError
-		if errors.As(err, &exitErr) {
-			return "", fmt.Errorf("cursor CLI failed (exit %d): %s", exitErr.ExitCode(), stderr.String())
-		}
-		return "", fmt.Errorf("failed to run cursor CLI: %w", err)
-	}
-
-	return strings.TrimSpace(stdout.String()), nil
-}
-
-func stripGitEnv(env []string) []string {
-	filtered := make([]string, 0, len(env))
-	for _, e := range env {
-		if !strings.HasPrefix(e, "GIT_") {
-			filtered = append(filtered, e)
-		}
+	result, err := agent.RunIsolatedTextGeneratorCLI(ctx, cursorCommandRunner, "agent", "cursor", args, "")
+	if err != nil {
+		return "", fmt.Errorf("cursor text generation failed: %w", err)
 	}
-	return filtered
+	return result, nil
 }

cmd/entire/cli/agent/geminicli/generate.go

@@ -1,13 +1,11 @@
 package geminicli
 
 import (
-	"bytes"
 	"context"
-	"errors"
 	"fmt"
-	"os"
 	"os/exec"
-	"strings"
+
+	"github.com/entireio/cli/cmd/entire/cli/agent"
 )
 
 var geminiCommandRunner = exec.CommandContext
@@ -19,36 +17,9 @@ func (g *GeminiCLIAgent) GenerateText(ctx context.Context, prompt string, model
 		args = append(args, "--model", model)
 	}
 
-	cmd := geminiCommandRunner(ctx, "gemini", args...)
-	cmd.Dir = os.TempDir()
-	cmd.Env = stripGitEnv(os.Environ())
-	cmd.Stdin = strings.NewReader(prompt)
-
-	var stdout, stderr bytes.Buffer
-	cmd.Stdout = &stdout
-	cmd.Stderr = &stderr
-
-	if err := cmd.Run(); err != nil {
-		var execErr *exec.Error
-		if errors.As(err, &execErr) {
-			return "", fmt.Errorf("gemini CLI not found: %w", err)
-		}
-		var exitErr *exec.ExitError
-		if errors.As(err, &exitErr) {
-			return "", fmt.Errorf("gemini CLI failed (exit %d): %s", exitErr.ExitCode(), stderr.String())
-		}
-		return "", fmt.Errorf("failed to run gemini CLI: %w", err)
-	}
-
-	return strings.TrimSpace(stdout.String()), nil
-}
-
-func stripGitEnv(env []string) []string {
-	filtered := make([]string, 0, len(env))
-	for _, e := range env {
-		if !strings.HasPrefix(e, "GIT_") {
-			filtered = append(filtered, e)
-		}
+	result, err := agent.RunIsolatedTextGeneratorCLI(ctx, geminiCommandRunner, "gemini", "gemini", args, prompt)
+	if err != nil {
+		return "", fmt.Errorf("gemini text generation failed: %w", err)
 	}
-	return filtered
+	return result, nil
 }

cmd/entire/cli/agent/text_generator_cli.go

@@ -0,0 +1,58 @@
+package agent
+
+import (
+	"bytes"
+	"context"
+	"errors"
+	"fmt"
+	"os"
+	"os/exec"
+	"strings"
+)
+
+// TextCommandRunner matches exec.CommandContext and allows tests to inject a runner.
+type TextCommandRunner func(ctx context.Context, name string, args ...string) *exec.Cmd
+
+// RunIsolatedTextGeneratorCLI executes a text-generation CLI in an isolated temp
+// directory with all GIT_* environment variables removed. This avoids recursive
+// hook triggers and repo side effects while preserving provider-specific flags.
+func RunIsolatedTextGeneratorCLI(ctx context.Context, runner TextCommandRunner, binary, displayName string, args []string, stdin string) (string, error) {
+	if runner == nil {
+		runner = exec.CommandContext
+	}
+
+	cmd := runner(ctx, binary, args...)
+	cmd.Dir = os.TempDir()
+	cmd.Env = StripGitEnv(os.Environ())
+	if stdin != "" {
+		cmd.Stdin = strings.NewReader(stdin)
+	}
+
+	var stdout, stderr bytes.Buffer
+	cmd.Stdout = &stdout
+	cmd.Stderr = &stderr
+
+	if err := cmd.Run(); err != nil {
+		var execErr *exec.Error
+		if errors.As(err, &execErr) {
+			return "", fmt.Errorf("%s CLI not found: %w", displayName, err)
+		}
+		var exitErr *exec.ExitError
+		if errors.As(err, &exitErr) {
+			return "", fmt.Errorf("%s CLI failed (exit %d): %s", displayName, exitErr.ExitCode(), stderr.String())
+		}
+		return "", fmt.Errorf("failed to run %s CLI: %w", displayName, err)
+	}
+
+	return strings.TrimSpace(stdout.String()), nil
+}
+
+func StripGitEnv(env []string) []string {
+	filtered := make([]string, 0, len(env))
+	for _, e := range env {
+		if !strings.HasPrefix(e, "GIT_") {
+			filtered = append(filtered, e)
+		}
+	}
+	return filtered
+}