fix: submit multi-pr reviews as one batch

Author: neversettle17-101

backend/internal/cli/review.go

@@ -1,6 +1,7 @@
 package cli
 
 import (
+	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
@@ -31,16 +32,26 @@ type reviewRun struct {
 
 // reviewRunResponse mirrors controllers.ReviewRunResponse.
 type reviewRunResponse struct {
-	Review           reviewRun `json:"review"`
-	ReviewerHandleID string    `json:"reviewerHandleId"`
+	Review           reviewRun   `json:"review"`
+	Reviews          []reviewRun `json:"reviews"`
+	ReviewerHandleID string      `json:"reviewerHandleId"`
 }
 
-// submitReviewRequest mirrors controllers.SubmitReviewInput.
-type submitReviewRequest struct {
+// submitReviewItem mirrors controllers.SubmitReviewItem.
+type submitReviewItem struct {
 	RunID          string `json:"runId"`
 	Verdict        string `json:"verdict"`
-	Body           string `json:"body"`
-	GithubReviewID string `json:"githubReviewId"`
+	Body           string `json:"body,omitempty"`
+	GithubReviewID string `json:"githubReviewId,omitempty"`
+}
+
+// submitReviewRequest mirrors controllers.SubmitReviewInput.
+type submitReviewRequest struct {
+	RunID          string             `json:"runId,omitempty"`
+	Verdict        string             `json:"verdict,omitempty"`
+	Body           string             `json:"body,omitempty"`
+	GithubReviewID string             `json:"githubReviewId,omitempty"`
+	Reviews        []submitReviewItem `json:"reviews,omitempty"`
 }
 
 type reviewSubmitOptions struct {
@@ -49,6 +60,7 @@ type reviewSubmitOptions struct {
 	verdict  string
 	body     string
 	reviewID string
+	reviews  string
 }
 
 func newReviewCommand(ctx *commandContext) *cobra.Command {
@@ -80,6 +92,7 @@ func newReviewSubmitCommand(ctx *commandContext) *cobra.Command {
 	cmd.Flags().StringVar(&opts.verdict, "verdict", "", "Review verdict: approved or changes_requested (required)")
 	cmd.Flags().StringVar(&opts.body, "body", "", "Review body: a path to a Markdown file, or - to read from stdin (so nothing is written into the worktree)")
 	cmd.Flags().StringVar(&opts.reviewID, "review-id", "", "Id of the GitHub PR review just posted (the .id from the gh api POST that created the review)")
+	cmd.Flags().StringVar(&opts.reviews, "reviews", "", "JSON review results array or object: a path, or - to read from stdin")
 	return cmd
 }
 
@@ -91,6 +104,9 @@ func (c *commandContext) submitReview(cmd *cobra.Command, args []string, opts re
 	if session == "" {
 		return usageError{errors.New("usage: worker session id is required (positional or --session)")}
 	}
+	if strings.TrimSpace(opts.reviews) != "" {
+		return c.submitReviewBatch(cmd, session, opts)
+	}
 	runID := strings.TrimSpace(opts.runID)
 	if runID == "" {
 		return usageError{errors.New("usage: --run is required")}
@@ -124,3 +140,49 @@ func (c *commandContext) submitReview(cmd *cobra.Command, args []string, opts re
 	_, err := fmt.Fprintf(cmd.OutOrStdout(), "recorded %s review for %s\n", res.Review.Verdict, session)
 	return err
 }
+
+func (c *commandContext) submitReviewBatch(cmd *cobra.Command, session string, opts reviewSubmitOptions) error {
+	if strings.TrimSpace(opts.runID) != "" || strings.TrimSpace(opts.verdict) != "" || strings.TrimSpace(opts.body) != "" || strings.TrimSpace(opts.reviewID) != "" {
+		return usageError{errors.New("usage: --reviews cannot be combined with --run, --verdict, --body, or --review-id")}
+	}
+	reviews, err := readReviewItems(cmd, strings.TrimSpace(opts.reviews))
+	if err != nil {
+		return err
+	}
+	path := "sessions/" + url.PathEscape(session) + "/reviews/submit"
+	var res reviewRunResponse
+	if err := c.postJSON(cmd.Context(), path, submitReviewRequest{Reviews: reviews}, &res); err != nil {
+		return err
+	}
+	count := len(res.Reviews)
+	if count == 0 {
+		count = len(reviews)
+	}
+	_, err = fmt.Fprintf(cmd.OutOrStdout(), "recorded %d review(s) for %s\n", count, session)
+	return err
+}
+
+func readReviewItems(cmd *cobra.Command, path string) ([]submitReviewItem, error) {
+	var raw []byte
+	var err error
+	if path == "-" {
+		raw, err = io.ReadAll(cmd.InOrStdin())
+	} else {
+		raw, err = os.ReadFile(path)
+	}
+	if err != nil {
+		return nil, usageError{fmt.Errorf("read review results: %w", err)}
+	}
+	var req submitReviewRequest
+	if err := json.Unmarshal(raw, &req); err == nil && len(req.Reviews) > 0 {
+		return req.Reviews, nil
+	}
+	var reviews []submitReviewItem
+	if err := json.Unmarshal(raw, &reviews); err != nil {
+		return nil, usageError{fmt.Errorf("decode review results JSON: %w", err)}
+	}
+	if len(reviews) == 0 {
+		return nil, usageError{errors.New("usage: --reviews requires at least one review result")}
+	}
+	return reviews, nil
+}

backend/internal/cli/review_test.go

@@ -104,6 +104,32 @@ func TestReviewSubmitAcceptsUnderscoreFlags(t *testing.T) {
 	}
 }
 
+func TestReviewSubmitBatchReadsReviewsFromStdin(t *testing.T) {
+	cfg := setConfigEnv(t)
+	srv, capture := reviewServer(t, http.StatusOK, `{"reviews":[{"id":"run-1","verdict":"changes_requested"},{"id":"run-2","verdict":"approved"}]}`)
+	writeRunFileFor(t, cfg, srv)
+
+	deps := aliveDeps()
+	deps.In = strings.NewReader(`{"reviews":[{"runId":"run-1","verdict":"changes_requested","body":"fix auth","githubReviewId":"101"},{"runId":"run-2","verdict":"approved","body":"looks good"}]}`)
+	out, errOut, err := executeCLI(t, deps, "review", "submit", "mer-1", "--reviews", "-")
+	if err != nil {
+		t.Fatalf("unexpected error: %v\nstderr=%s", err, errOut)
+	}
+	if !strings.Contains(out, "recorded 2 review(s) for mer-1") {
+		t.Fatalf("stdout = %q", out)
+	}
+	var req submitReviewRequest
+	if err := json.Unmarshal([]byte(capture.body), &req); err != nil {
+		t.Fatalf("decode body: %v", err)
+	}
+	if len(req.Reviews) != 2 || req.Reviews[0].RunID != "run-1" || req.Reviews[0].GithubReviewID != "101" || req.Reviews[1].Verdict != "approved" {
+		t.Fatalf("request = %+v", req)
+	}
+	if req.RunID != "" || req.Verdict != "" {
+		t.Fatalf("batch request should not also set legacy fields: %+v", req)
+	}
+}
+
 func TestReviewSubmitUsesSessionFlag(t *testing.T) {
 	cfg := setConfigEnv(t)
 	srv, capture := reviewServer(t, http.StatusOK, `{"review":{"verdict":"approved"}}`)

backend/internal/httpd/apispec/openapi.yaml

@@ -2007,8 +2007,13 @@ components:
           $ref: '#/components/schemas/ReviewRun'
         reviewerHandleId:
           type: string
+        reviews:
+          items:
+            $ref: '#/components/schemas/ReviewRun'
+          type: array
       required:
       - review
+      - reviews
       - reviewerHandleId
       type: object
     RoleOverride:
@@ -2411,6 +2416,26 @@ components:
       - projectId
       type: object
     SubmitReviewInput:
+      properties:
+        body:
+          description: Review body recorded by AO. Required for changes_requested.
+          type: string
+        githubReviewId:
+          description: Id of the GitHub PR review the reviewer posted, if any.
+          type: string
+        reviews:
+          description: Batched review results recorded by one reviewer CLI command.
+          items:
+            $ref: '#/components/schemas/SubmitReviewItem'
+          type: array
+        runId:
+          description: Review run id being completed.
+          type: string
+        verdict:
+          description: 'Review verdict: approved or changes_requested.'
+          type: string
+      type: object
+    SubmitReviewItem:
       properties:
         body:
           description: Review body recorded by AO. Required for changes_requested.
@@ -2427,8 +2452,6 @@ components:
       required:
       - runId
       - verdict
-      - body
-      - githubReviewId
       type: object
     TriggerReviewResponse:
       properties:

backend/internal/httpd/apispec/specgen/build.go

@@ -184,6 +184,7 @@ var schemaNames = map[string]string{
 	"ControllersListReviewsResponse":   "ListReviewsResponse",
 	"ControllersReviewRunResponse":     "ReviewRunResponse",
 	"ControllersTriggerReviewResponse": "TriggerReviewResponse",
+	"ControllersSubmitReviewItem":      "SubmitReviewItem",
 	"ControllersSubmitReviewInput":     "SubmitReviewInput",
 	// domain review entities
 	"DomainReviewRun":     "ReviewRun",

backend/internal/httpd/controllers/reviews.go

@@ -25,8 +25,9 @@ type ListReviewsResponse struct {
 // ReviewRunResponse is the body of submit (200). It carries the run plus the
 // reviewer pane handle so the UI can attach a terminal.
 type ReviewRunResponse struct {
-	Review           domain.ReviewRun `json:"review"`
-	ReviewerHandleID string           `json:"reviewerHandleId"`
+	Review           domain.ReviewRun   `json:"review"`
+	Reviews          []domain.ReviewRun `json:"reviews"`
+	ReviewerHandleID string             `json:"reviewerHandleId"`
 }
 
 // TriggerReviewResponse is the body of trigger (200/201). reviews carries the
@@ -36,12 +37,21 @@ type TriggerReviewResponse struct {
 	Reviews          []reviewcore.PRReviewState `json:"reviews"`
 }
 
-// SubmitReviewInput is the body of POST /api/v1/sessions/{sessionId}/reviews/submit.
-type SubmitReviewInput struct {
+// SubmitReviewItem is one review result in a batched submit request.
+type SubmitReviewItem struct {
 	RunID          string `json:"runId" description:"Review run id being completed."`
 	Verdict        string `json:"verdict" description:"Review verdict: approved or changes_requested."`
-	Body           string `json:"body" description:"Review body recorded by AO. Required for changes_requested."`
-	GithubReviewID string `json:"githubReviewId" description:"Id of the GitHub PR review the reviewer posted, if any."`
+	Body           string `json:"body,omitempty" description:"Review body recorded by AO. Required for changes_requested."`
+	GithubReviewID string `json:"githubReviewId,omitempty" description:"Id of the GitHub PR review the reviewer posted, if any."`
+}
+
+// SubmitReviewInput is the body of POST /api/v1/sessions/{sessionId}/reviews/submit.
+type SubmitReviewInput struct {
+	RunID          string             `json:"runId,omitempty" description:"Review run id being completed."`
+	Verdict        string             `json:"verdict,omitempty" description:"Review verdict: approved or changes_requested."`
+	Body           string             `json:"body,omitempty" description:"Review body recorded by AO. Required for changes_requested."`
+	GithubReviewID string             `json:"githubReviewId,omitempty" description:"Id of the GitHub PR review the reviewer posted, if any."`
+	Reviews        []SubmitReviewItem `json:"reviews,omitempty" description:"Batched review results recorded by one reviewer CLI command."`
 }
 
 // ReviewsController owns the session-scoped /reviews routes. A nil Svc returns 501.
@@ -109,12 +119,34 @@ func (c *ReviewsController) submit(w http.ResponseWriter, r *http.Request) {
 		envelope.WriteAPIError(w, r, http.StatusBadRequest, "bad_request", "INVALID_BODY", "Invalid request body", nil)
 		return
 	}
-	run, err := c.Svc.Submit(r.Context(), sessionID(r), in.RunID, domain.ReviewVerdict(in.Verdict), in.Body, in.GithubReviewID)
+	reviews := make([]reviewsvc.SubmittedReview, 0, len(in.Reviews))
+	if len(in.Reviews) > 0 {
+		for _, item := range in.Reviews {
+			reviews = append(reviews, reviewsvc.SubmittedReview{
+				RunID:          item.RunID,
+				Verdict:        domain.ReviewVerdict(item.Verdict),
+				Body:           item.Body,
+				GithubReviewID: item.GithubReviewID,
+			})
+		}
+	} else {
+		reviews = append(reviews, reviewsvc.SubmittedReview{
+			RunID:          in.RunID,
+			Verdict:        domain.ReviewVerdict(in.Verdict),
+			Body:           in.Body,
+			GithubReviewID: in.GithubReviewID,
+		})
+	}
+	runs, err := c.Svc.SubmitMany(r.Context(), sessionID(r), reviews)
 	if err != nil {
 		writeReviewError(w, r, err)
 		return
 	}
-	envelope.WriteJSON(w, http.StatusOK, ReviewRunResponse{Review: run})
+	first := domain.ReviewRun{}
+	if len(runs) > 0 {
+		first = runs[0]
+	}
+	envelope.WriteJSON(w, http.StatusOK, ReviewRunResponse{Review: first, Reviews: runs})
 }
 
 func writeReviewError(w http.ResponseWriter, r *http.Request, err error) {

backend/internal/httpd/controllers/reviews_test.go

@@ -22,6 +22,7 @@ type fakeReviewService struct {
 	triggerErr error
 	trigger    reviewcore.TriggerResult
 	list       reviewcore.SessionReviews
+	submitted  []reviewsvc.SubmittedReview
 }
 
 func (f *fakeReviewService) Trigger(context.Context, domain.SessionID) (reviewcore.TriggerResult, error) {
@@ -38,6 +39,15 @@ func (f *fakeReviewService) Submit(context.Context, domain.SessionID, string, do
 	return domain.ReviewRun{}, nil
 }
 
+func (f *fakeReviewService) SubmitMany(_ context.Context, _ domain.SessionID, reviews []reviewsvc.SubmittedReview) ([]domain.ReviewRun, error) {
+	f.submitted = append([]reviewsvc.SubmittedReview(nil), reviews...)
+	runs := make([]domain.ReviewRun, 0, len(reviews))
+	for _, review := range reviews {
+		runs = append(runs, domain.ReviewRun{ID: review.RunID, Verdict: review.Verdict, Body: review.Body, GithubReviewID: review.GithubReviewID})
+	}
+	return runs, nil
+}
+
 func (f *fakeReviewService) List(context.Context, domain.SessionID) (reviewcore.SessionReviews, error) {
 	return f.list, nil
 }
@@ -115,3 +125,22 @@ func TestReviewsTriggerIncludesBatchFields(t *testing.T) {
 		}
 	}
 }
+
+func TestReviewsSubmitAcceptsBatchedReviews(t *testing.T) {
+	svc := &fakeReviewService{}
+	srv := newReviewTestServer(t, svc)
+
+	body, status, headers := doRequest(t, srv, "POST", "/api/v1/sessions/mer-1/reviews/submit", `{"reviews":[{"runId":"run-1","verdict":"changes_requested","body":"fix auth","githubReviewId":"101"},{"runId":"run-2","verdict":"approved"}]}`)
+	assertJSON(t, headers)
+	if status != http.StatusOK {
+		t.Fatalf("status = %d body=%s", status, body)
+	}
+	if len(svc.submitted) != 2 || svc.submitted[0].RunID != "run-1" || svc.submitted[1].Verdict != domain.VerdictApproved {
+		t.Fatalf("submitted = %+v", svc.submitted)
+	}
+	for _, want := range []string{`"reviews"`, `"run-1"`, `"run-2"`} {
+		if !strings.Contains(string(body), want) {
+			t.Fatalf("body missing %s: %s", want, body)
+		}
+	}
+}

backend/internal/lifecycle/reactions.go

@@ -44,8 +44,9 @@ type ReviewResult struct {
 	DeliveredAt    *time.Time
 }
 
-// ApplyReviewBatch reacts to a completed trigger batch after the review service
-// has decided which current-head changes-requested results are deliverable.
+// ApplyReviewBatch reacts to one reviewer CLI submission after the review
+// service has decided which current-head changes-requested results are
+// deliverable.
 func (m *Manager) ApplyReviewBatch(ctx context.Context, workerID domain.SessionID, batchID string, results []ReviewResult) (ReviewDeliveryOutcome, error) {
 	if batchID == "" || len(results) == 0 {
 		return ReviewDeliveryNoop, nil

backend/internal/ports/reviewer.go

@@ -37,9 +37,8 @@ type ReviewInvocation struct {
 	PRURL string
 	// TargetSHA is the PR head commit under review.
 	TargetSHA string
-	// ReviewQueue lists all review tasks created by the same trigger. Reviewers
-	// still complete one RunID at a time, but this gives a shared reviewer pane
-	// enough context to process a multi-PR queue in order.
+	// ReviewQueue lists all review tasks created by the same trigger so a shared
+	// reviewer pane can review multiple PRs and submit the results together.
 	ReviewQueue []ReviewTask
 	// ReviewIndex is this invocation's zero-based position in ReviewQueue.
 	ReviewIndex int