Add wl approve and wl request-changes for PR review workflow

Submit GitHub PR reviews (APPROVE / REQUEST_CHANGES) on PR shells
created by wl review --gh-pr. Also adds best-effort approval status
warnings to wl merge (advisory only, never blocks).

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: julianknutsen

cmd/wl/cmd_approve.go

@@ -0,0 +1,59 @@
+package main
+
+import (
+	"fmt"
+	"io"
+	"os/exec"
+
+	"github.com/spf13/cobra"
+	"github.com/steveyegge/wasteland/internal/style"
+)
+
+func newApproveCmd(stdout, stderr io.Writer) *cobra.Command {
+	var comment string
+
+	cmd := &cobra.Command{
+		Use:   "approve <branch>",
+		Short: "Approve a PR-mode branch",
+		Long: `Submit an approving review on the GitHub PR for a wl/* branch.
+
+Requires a GitHub PR to exist (created via 'wl review --gh-pr').
+
+Examples:
+  wl approve wl/my-rig/w-abc123
+  wl approve wl/my-rig/w-abc123 --comment "LGTM"`,
+		Args: cobra.ExactArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return runApprove(cmd, stdout, stderr, args[0], comment)
+		},
+	}
+
+	cmd.Flags().StringVar(&comment, "comment", "", "Review comment")
+
+	return cmd
+}
+
+func runApprove(cmd *cobra.Command, stdout, _ io.Writer, branch, comment string) error {
+	cfg, err := resolveWasteland(cmd)
+	if err != nil {
+		return fmt.Errorf("loading wasteland config: %w", err)
+	}
+
+	if cfg.GitHubRepo == "" {
+		return fmt.Errorf("github-repo not configured (run 'wl config set github-repo owner/repo')")
+	}
+
+	ghPath, err := exec.LookPath("gh")
+	if err != nil {
+		return fmt.Errorf("gh not found in PATH — install from https://cli.github.com")
+	}
+
+	prURL, err := submitPRReview(ghPath, cfg.GitHubRepo, cfg.ForkOrg, branch, "APPROVE", comment)
+	if err != nil {
+		return err
+	}
+
+	fmt.Fprintf(stdout, "%s Approved %s\n", style.Bold.Render("✓"), branch)
+	fmt.Fprintf(stdout, "  %s\n", prURL)
+	return nil
+}

cmd/wl/cmd_approve_test.go

@@ -0,0 +1,27 @@
+package main
+
+import (
+	"bytes"
+	"testing"
+)
+
+func TestApproveRequiresArg(t *testing.T) {
+	var stdout, stderr bytes.Buffer
+	root := newRootCmd(&stdout, &stderr)
+
+	for _, c := range root.Commands() {
+		if c.Name() == "approve" {
+			if err := c.Args(c, []string{}); err == nil {
+				t.Error("approve should require exactly 1 argument")
+			}
+			if err := c.Args(c, []string{"wl/rig/w-abc"}); err != nil {
+				t.Errorf("approve should accept 1 argument: %v", err)
+			}
+			if err := c.Args(c, []string{"a", "b"}); err == nil {
+				t.Error("approve should reject 2 arguments")
+			}
+			return
+		}
+	}
+	t.Fatal("approve command not found")
+}

cmd/wl/cmd_merge.go

@@ -54,6 +54,18 @@ func runMerge(cmd *cobra.Command, stdout, _ io.Writer, branch string, noPush, ke
 		return fmt.Errorf("branch %q does not exist", branch)
 	}
 
+	// Best-effort: check PR approval status before merging.
+	if cfg.GitHubRepo != "" {
+		if ghPath, err := exec.LookPath("gh"); err == nil {
+			hasApproval, hasChangesRequested := prApprovalStatus(ghPath, cfg.GitHubRepo, cfg.ForkOrg, branch)
+			if hasChangesRequested {
+				fmt.Fprintf(stdout, "  %s PR has outstanding change requests\n", style.Warning.Render("⚠"))
+			} else if !hasApproval {
+				fmt.Fprintf(stdout, "  %s PR has no approvals\n", style.Warning.Render("⚠"))
+			}
+		}
+	}
+
 	if err := commons.MergeBranch(cfg.LocalDir, branch); err != nil {
 		return err
 	}

cmd/wl/cmd_request_changes.go

@@ -0,0 +1,60 @@
+package main
+
+import (
+	"fmt"
+	"io"
+	"os/exec"
+
+	"github.com/spf13/cobra"
+	"github.com/steveyegge/wasteland/internal/style"
+)
+
+func newRequestChangesCmd(stdout, stderr io.Writer) *cobra.Command {
+	var comment string
+
+	cmd := &cobra.Command{
+		Use:   "request-changes <branch>",
+		Short: "Request changes on a PR-mode branch",
+		Long: `Submit a "request changes" review on the GitHub PR for a wl/* branch.
+
+Requires a GitHub PR to exist (created via 'wl review --gh-pr').
+The --comment flag is required to explain what needs to change.
+
+Examples:
+  wl request-changes wl/my-rig/w-abc123 --comment "needs tests"`,
+		Args: cobra.ExactArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return runRequestChanges(cmd, stdout, stderr, args[0], comment)
+		},
+	}
+
+	cmd.Flags().StringVar(&comment, "comment", "", "Review comment (required)")
+	_ = cmd.MarkFlagRequired("comment")
+
+	return cmd
+}
+
+func runRequestChanges(cmd *cobra.Command, stdout, _ io.Writer, branch, comment string) error {
+	cfg, err := resolveWasteland(cmd)
+	if err != nil {
+		return fmt.Errorf("loading wasteland config: %w", err)
+	}
+
+	if cfg.GitHubRepo == "" {
+		return fmt.Errorf("github-repo not configured (run 'wl config set github-repo owner/repo')")
+	}
+
+	ghPath, err := exec.LookPath("gh")
+	if err != nil {
+		return fmt.Errorf("gh not found in PATH — install from https://cli.github.com")
+	}
+
+	prURL, err := submitPRReview(ghPath, cfg.GitHubRepo, cfg.ForkOrg, branch, "REQUEST_CHANGES", comment)
+	if err != nil {
+		return err
+	}
+
+	fmt.Fprintf(stdout, "%s Requested changes on %s\n", style.Bold.Render("✓"), branch)
+	fmt.Fprintf(stdout, "  %s\n", prURL)
+	return nil
+}

cmd/wl/cmd_request_changes_test.go

@@ -0,0 +1,27 @@
+package main
+
+import (
+	"bytes"
+	"testing"
+)
+
+func TestRequestChangesRequiresArg(t *testing.T) {
+	var stdout, stderr bytes.Buffer
+	root := newRootCmd(&stdout, &stderr)
+
+	for _, c := range root.Commands() {
+		if c.Name() == "request-changes" {
+			if err := c.Args(c, []string{}); err == nil {
+				t.Error("request-changes should require exactly 1 argument")
+			}
+			if err := c.Args(c, []string{"wl/rig/w-abc"}); err != nil {
+				t.Errorf("request-changes should accept 1 argument: %v", err)
+			}
+			if err := c.Args(c, []string{"a", "b"}); err == nil {
+				t.Error("request-changes should reject 2 arguments")
+			}
+			return
+		}
+	}
+	t.Fatal("request-changes command not found")
+}

cmd/wl/cmd_review.go

@@ -453,6 +453,72 @@ func wantedTitleFromBranch(doltPath, dbDir, branch string) string {
 	return strings.TrimSpace(lines[1])
 }
 
+// submitPRReview submits a review on the GitHub PR for the given branch.
+// event must be "APPROVE" or "REQUEST_CHANGES".
+func submitPRReview(ghPath, upstreamRepo, forkOrg, branch, event, comment string) (string, error) {
+	head := forkOrg + ":" + branch
+	prURL, number := findExistingPR(ghPath, upstreamRepo, head)
+	if number == "" {
+		return "", fmt.Errorf("no open PR found for branch %s", branch)
+	}
+
+	reviewBody, _ := json.Marshal(map[string]string{
+		"event": event,
+		"body":  comment,
+	})
+	_, err := ghAPICall(ghPath, "POST", fmt.Sprintf("repos/%s/pulls/%s/reviews", upstreamRepo, number), string(reviewBody))
+	if err != nil {
+		return "", fmt.Errorf("submitting review: %w", err)
+	}
+	return prURL, nil
+}
+
+// parseReviewStatus parses GitHub review list JSON into approval state.
+// It tracks the latest review state per user and returns two independent bools.
+func parseReviewStatus(data []byte) (hasApproval, hasChangesRequested bool) {
+	var reviews []struct {
+		User  struct{ Login string } `json:"user"`
+		State string                 `json:"state"`
+	}
+	if err := json.Unmarshal(data, &reviews); err != nil {
+		return false, false
+	}
+
+	latest := map[string]string{}
+	for _, r := range reviews {
+		switch r.State {
+		case "APPROVED", "CHANGES_REQUESTED":
+			latest[r.User.Login] = r.State
+		}
+	}
+
+	for _, state := range latest {
+		switch state {
+		case "APPROVED":
+			hasApproval = true
+		case "CHANGES_REQUESTED":
+			hasChangesRequested = true
+		}
+	}
+	return hasApproval, hasChangesRequested
+}
+
+// prApprovalStatus checks the review status of a GitHub PR. Best-effort.
+// Silently returns (false, false) on any error.
+func prApprovalStatus(ghPath, upstreamRepo, forkOrg, branch string) (hasApproval, hasChangesRequested bool) {
+	head := forkOrg + ":" + branch
+	_, number := findExistingPR(ghPath, upstreamRepo, head)
+	if number == "" {
+		return false, false
+	}
+
+	data, err := ghAPICall(ghPath, "GET", fmt.Sprintf("repos/%s/pulls/%s/reviews", upstreamRepo, number), "")
+	if err != nil {
+		return false, false
+	}
+	return parseReviewStatus(data)
+}
+
 // closeGitHubPR finds and closes an open GitHub PR for the given branch.
 // Best-effort: failures print warnings but don't block the merge.
 func closeGitHubPR(ghPath, upstreamRepo, forkOrg, forkDB, branch string, stdout io.Writer) {

cmd/wl/cmd_review_test.go

@@ -72,6 +72,76 @@ func TestReviewGhPRRequiresBranch(t *testing.T) {
 	}
 }
 
+func TestParseReviewStatus(t *testing.T) {
+	tests := []struct {
+		name                         string
+		json                         string
+		wantApproval, wantChangesReq bool
+	}{
+		{
+			name:         "empty reviews",
+			json:         `[]`,
+			wantApproval: false, wantChangesReq: false,
+		},
+		{
+			name:         "single approval",
+			json:         `[{"user":{"login":"alice"},"state":"APPROVED"}]`,
+			wantApproval: true, wantChangesReq: false,
+		},
+		{
+			name:         "single changes requested",
+			json:         `[{"user":{"login":"alice"},"state":"CHANGES_REQUESTED"}]`,
+			wantApproval: false, wantChangesReq: true,
+		},
+		{
+			name: "changes then approval same user",
+			json: `[
+				{"user":{"login":"alice"},"state":"CHANGES_REQUESTED"},
+				{"user":{"login":"alice"},"state":"APPROVED"}
+			]`,
+			wantApproval: true, wantChangesReq: false,
+		},
+		{
+			name: "approval then changes same user",
+			json: `[
+				{"user":{"login":"alice"},"state":"APPROVED"},
+				{"user":{"login":"alice"},"state":"CHANGES_REQUESTED"}
+			]`,
+			wantApproval: false, wantChangesReq: true,
+		},
+		{
+			name: "mixed users",
+			json: `[
+				{"user":{"login":"alice"},"state":"APPROVED"},
+				{"user":{"login":"bob"},"state":"CHANGES_REQUESTED"}
+			]`,
+			wantApproval: true, wantChangesReq: true,
+		},
+		{
+			name:         "comment only ignored",
+			json:         `[{"user":{"login":"alice"},"state":"COMMENTED"}]`,
+			wantApproval: false, wantChangesReq: false,
+		},
+		{
+			name:         "invalid JSON",
+			json:         `not json`,
+			wantApproval: false, wantChangesReq: false,
+		},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			gotApproval, gotChangesReq := parseReviewStatus([]byte(tc.json))
+			if gotApproval != tc.wantApproval {
+				t.Errorf("hasApproval = %v, want %v", gotApproval, tc.wantApproval)
+			}
+			if gotChangesReq != tc.wantChangesReq {
+				t.Errorf("hasChangesRequested = %v, want %v", gotChangesReq, tc.wantChangesReq)
+			}
+		})
+	}
+}
+
 func TestExtractWantedID(t *testing.T) {
 	tests := []struct {
 		branch, want string

cmd/wl/main.go

@@ -79,6 +79,8 @@ func newRootCmd(stdout, stderr io.Writer) *cobra.Command {
 		newListCmd(stdout, stderr),
 		newConfigCmd(stdout, stderr),
 		newReviewCmd(stdout, stderr),
+		newApproveCmd(stdout, stderr),
+		newRequestChangesCmd(stdout, stderr),
 		newMergeCmd(stdout, stderr),
 		newVersionCmd(stdout),
 	)

cmd/wl/main_test.go

@@ -28,7 +28,7 @@ func TestSubcommandRegistration(t *testing.T) {
 	var stdout, stderr bytes.Buffer
 	root := newRootCmd(&stdout, &stderr)
 
-	expected := []string{"join", "post", "claim", "unclaim", "done", "accept", "reject", "update", "delete", "browse", "status", "sync", "leave", "list", "config", "review", "merge", "version"}
+	expected := []string{"join", "post", "claim", "unclaim", "done", "accept", "reject", "update", "delete", "browse", "status", "sync", "leave", "list", "config", "review", "approve", "request-changes", "merge", "version"}
 	for _, name := range expected {
 		found := false
 		for _, c := range root.Commands() {

cmd/wl/testdata/errors.txtar

@@ -138,6 +138,26 @@ stderr 'accepts 1 arg'
 ! exec wl status w-abc
 stderr 'not joined'
 
+# approve with no args.
+! exec wl approve
+stderr 'accepts 1 arg'
+
+# approve not joined.
+! exec wl approve wl/some/branch
+stderr 'not joined'
+
+# request-changes with no args.
+! exec wl request-changes
+stderr 'accepts 1 arg'
+
+# request-changes missing --comment.
+! exec wl request-changes wl/some/branch
+stderr 'required flag.*"comment"'
+
+# request-changes not joined.
+! exec wl request-changes wl/some/branch --comment needs-work
+stderr 'not joined'
+
 # review not joined.
 ! exec wl review
 stderr 'not joined'