Agentic Setup - PR Proposal

Author: DylanBlakemore

cmd/setup.go

@@ -228,7 +228,8 @@ func runAgentOnce(
 
 	retryErr := retrySetupIfRequested(runner, setupConfig, decision)
 
-	_ = writeAgentSummary(ctx, llm, runtimeCfg.Model, wd, execErr, decision, retryErr)
+	buckets, _, _ := writeAgentSummary(ctx, llm, runtimeCfg.Model, wd, execErr, decision, retryErr)
+	_ = maybeOfferSetupFixPR(ctx, wd, buckets)
 	return retryErr
 }
 
@@ -305,32 +306,32 @@ func writeAgentSummary(
 	execErr *setup.SetupExecutionError,
 	decision *agent.Decision,
 	retryErr error,
-) error {
+) (*agent.IssueBuckets, string, error) {
 	if strings.TrimSpace(baseDir) == "" {
-		return nil
+		return nil, "", nil
 	}
 	if execErr == nil || execErr.Report == nil || decision == nil {
-		return nil
+		return nil, "", nil
 	}
 
 	buckets, err := agent.AssessIssues(ctx, llm, model, execErr.Report, decision)
 	if err != nil {
-		return err
+		return nil, "", err
 	}
 
 	summaryPath := filepath.Join(baseDir, ".initiat", "agent-summary.md")
 	if err := os.MkdirAll(filepath.Dir(summaryPath), agentSummaryDirPerm); err != nil {
-		return err
+		return nil, "", err
 	}
 
 	content := buildAgentSummaryMarkdown(execErr, decision, buckets, retryErr)
 	if err := os.WriteFile(summaryPath, []byte(content), agentSummaryFilePerm); err != nil {
-		return err
+		return nil, "", err
 	}
 
 	fmt.Println()
 	fmt.Println("Wrote agent summary to", summaryPath)
-	return nil
+	return buckets, summaryPath, nil
 }
 
 func buildAgentSummaryMarkdown(

cmd/setup_pr.go

@@ -0,0 +1,179 @@
+package cmd
+
+import (
+	"bytes"
+	"context"
+	"fmt"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strings"
+	"time"
+
+	"github.com/InitiatDev/initiat-cli/internal/agent"
+	"github.com/InitiatDev/initiat-cli/internal/git"
+	"github.com/InitiatDev/initiat-cli/internal/prompt"
+	"github.com/InitiatDev/initiat-cli/internal/setupfixpr"
+)
+
+const (
+	prBranchTimeFormat = "20060102-150405"
+)
+
+func maybeOfferSetupFixPR(ctx context.Context, baseDir string, buckets *agent.IssueBuckets) error {
+	gitRoot, eligible, ok, err := detectSetupFixPREligibility(ctx, baseDir, buckets)
+	if err != nil {
+		return err
+	}
+	if !ok {
+		return nil
+	}
+
+	fmt.Println()
+	fmt.Println("Agent made setup-related changes that look PR-eligible:")
+	for _, p := range eligible {
+		fmt.Println(" -", p)
+	}
+
+	shouldCreatePR, err := prompt.PromptYesNo("Create a PR with these setup fixes?")
+	if err != nil {
+		return err
+	}
+	if !shouldCreatePR {
+		return nil
+	}
+
+	okToProceed, err := prompt.PromptYesNo("Proceed with git operations (branch, commit, push, PR)?")
+	if err != nil {
+		return err
+	}
+	if !okToProceed {
+		return nil
+	}
+
+	return createSetupFixPR(ctx, gitRoot, eligible, buckets)
+}
+
+func detectSetupFixPREligibility(
+	ctx context.Context,
+	baseDir string,
+	buckets *agent.IssueBuckets,
+) (string, []string, bool, error) {
+	if strings.TrimSpace(baseDir) == "" {
+		return "", nil, false, nil
+	}
+
+	handler := git.NewHandler()
+	gitRoot, ok := handler.FindGitRoot(filepath.Join(baseDir, "."))
+	if !ok || strings.TrimSpace(gitRoot) == "" {
+		return "", nil, false, nil
+	}
+
+	statusOut, err := runGit(ctx, gitRoot, "status", "--porcelain")
+	if err != nil {
+		return "", nil, false, err
+	}
+
+	changed := setupfixpr.ParseGitPorcelainPaths(statusOut)
+	eligible := setupfixpr.EligibleSetupFixPaths(changed)
+	if len(eligible) == 0 {
+		return "", nil, false, nil
+	}
+
+	if buckets != nil && len(buckets.SetupOrApp) == 0 {
+		return "", nil, false, nil
+	}
+
+	return gitRoot, eligible, true, nil
+}
+
+func createSetupFixPR(ctx context.Context, gitRoot string, eligible []string, buckets *agent.IssueBuckets) error {
+	baseBranch := detectBaseBranch(ctx, gitRoot)
+
+	branch := fmt.Sprintf("initiat-agent-setup-fix-%s", time.Now().Format(prBranchTimeFormat))
+
+	if _, err := runGit(ctx, gitRoot, "checkout", "-b", branch); err != nil {
+		return err
+	}
+	if _, err := runGit(ctx, gitRoot, append([]string{"add", "--"}, eligible...)...); err != nil {
+		return err
+	}
+	if _, err := runGit(ctx, gitRoot, "commit", "-m", "chore(setup): agent-guided setup fixes"); err != nil {
+		return err
+	}
+	if _, err := runGit(ctx, gitRoot, "push", "-u", "origin", "HEAD"); err != nil {
+		return err
+	}
+
+	if _, err := exec.LookPath("gh"); err != nil {
+		fmt.Println()
+		fmt.Println("GitHub CLI (gh) not found. You can open a PR manually from your pushed branch.")
+		return nil
+	}
+
+	title := "Setup fixes (agent-guided)"
+	body := buildSetupFixPRBody(buckets)
+	out, err := runGH(ctx, gitRoot, "pr", "create", "--base", baseBranch, "--title", title, "--body", body)
+	if err != nil {
+		return err
+	}
+
+	fmt.Println()
+	fmt.Println(strings.TrimSpace(out))
+	return nil
+}
+
+func buildSetupFixPRBody(buckets *agent.IssueBuckets) string {
+	var b strings.Builder
+	b.WriteString("## Summary\n")
+	b.WriteString("- Agent-guided setup changes to improve onboarding reliability.\n\n")
+
+	if buckets == nil {
+		return b.String()
+	}
+
+	if len(buckets.SetupOrApp) > 0 {
+		b.WriteString("## Setup/App issues addressed\n")
+		for _, it := range buckets.SetupOrApp {
+			b.WriteString("- " + it + "\n")
+		}
+		b.WriteString("\n")
+	}
+
+	if strings.TrimSpace(buckets.Notes) != "" {
+		b.WriteString("## Notes\n")
+		b.WriteString(buckets.Notes)
+		b.WriteString("\n")
+	}
+
+	return b.String()
+}
+
+func detectBaseBranch(ctx context.Context, gitRoot string) string {
+	out, err := runGit(ctx, gitRoot, "symbolic-ref", "refs/remotes/origin/HEAD")
+	if err == nil {
+		return setupfixpr.BaseBranchFromOriginHeadRef(out)
+	}
+	return "main"
+}
+
+func runGit(ctx context.Context, dir string, args ...string) (string, error) {
+	return runBin(ctx, dir, "git", args...)
+}
+
+func runGH(ctx context.Context, dir string, args ...string) (string, error) {
+	return runBin(ctx, dir, "gh", args...)
+}
+
+func runBin(ctx context.Context, dir string, bin string, args ...string) (string, error) {
+	cmd := exec.CommandContext(ctx, bin, args...)
+	cmd.Dir = dir
+	cmd.Env = os.Environ()
+	var buf bytes.Buffer
+	cmd.Stdout = &buf
+	cmd.Stderr = &buf
+	if err := cmd.Run(); err != nil {
+		return "", fmt.Errorf("%s %s: %w\n%s", bin, strings.Join(args, " "), err, strings.TrimSpace(buf.String()))
+	}
+	return buf.String(), nil
+}

internal/setupfixpr/setupfixpr.go

@@ -0,0 +1,54 @@
+package setupfixpr
+
+import (
+	"path/filepath"
+	"strings"
+)
+
+const (
+	porcelainMinLen   = 4
+	renameArrow       = " -> "
+	defaultBaseBranch = "main"
+)
+
+func EligibleSetupFixPaths(paths []string) []string {
+	var out []string
+	for _, p := range paths {
+		p = filepath.Clean(p)
+		switch p {
+		case filepath.Join(".initiat", "setup.yml"),
+			filepath.Join(".initiat", "setup.yaml"):
+			out = append(out, p)
+		}
+	}
+	return out
+}
+
+func ParseGitPorcelainPaths(status string) []string {
+	var out []string
+	for _, line := range strings.Split(status, "\n") {
+		line = strings.TrimRight(line, "\r")
+		if len(line) < porcelainMinLen {
+			continue
+		}
+		path := strings.TrimSpace(line[3:])
+		if path == "" {
+			continue
+		}
+		if strings.Contains(path, renameArrow) {
+			parts := strings.Split(path, renameArrow)
+			path = strings.TrimSpace(parts[len(parts)-1])
+		}
+		out = append(out, path)
+	}
+	return out
+}
+
+func BaseBranchFromOriginHeadRef(originHeadRef string) string {
+	s := strings.TrimSpace(originHeadRef)
+	const prefix = "refs/remotes/origin/"
+	if strings.HasPrefix(s, prefix) {
+		return strings.TrimPrefix(s, prefix)
+	}
+	return defaultBaseBranch
+}

internal/setupfixpr/setupfixpr_test.go

@@ -0,0 +1,31 @@
+package setupfixpr
+
+import "testing"
+
+func TestParseGitPorcelainPaths(t *testing.T) {
+	in := " M .initiat/setup.yml\nR  old.yml -> .initiat/setup.yaml\n?? foo.txt\n"
+	paths := ParseGitPorcelainPaths(in)
+	if len(paths) != 3 {
+		t.Fatalf("expected 3 paths, got %d", len(paths))
+	}
+	if paths[0] != ".initiat/setup.yml" {
+		t.Fatalf("unexpected first: %q", paths[0])
+	}
+	if paths[1] != ".initiat/setup.yaml" {
+		t.Fatalf("unexpected rename target: %q", paths[1])
+	}
+	if paths[2] != "foo.txt" {
+		t.Fatalf("unexpected third: %q", paths[2])
+	}
+}
+
+func TestEligibleSetupFixPaths(t *testing.T) {
+	in := []string{".initiat/setup.yml", ".initiat/agent-summary.md", "README.md", ".initiat/setup.yaml"}
+	got := EligibleSetupFixPaths(in)
+	if len(got) != 2 {
+		t.Fatalf("expected 2, got %d", len(got))
+	}
+	if got[0] != ".initiat/setup.yml" || got[1] != ".initiat/setup.yaml" {
+		t.Fatalf("unexpected: %#v", got)
+	}
+}