189 lines
6.6 KiB
Go
189 lines
6.6 KiB
Go
package cli
|
|
|
|
import (
|
|
"encoding/json"
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
"net/url"
|
|
"os"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/spf13/cobra"
|
|
"github.com/spf13/pflag"
|
|
)
|
|
|
|
// reviewRun mirrors the daemon's domain.ReviewRun for the CLI client.
|
|
type reviewRun struct {
|
|
ID string `json:"id"`
|
|
SessionID string `json:"sessionId"`
|
|
BatchID string `json:"batchId"`
|
|
Harness string `json:"harness"`
|
|
PRURL string `json:"prUrl"`
|
|
TargetSHA string `json:"targetSha"`
|
|
Status string `json:"status"`
|
|
Verdict string `json:"verdict"`
|
|
Body string `json:"body"`
|
|
GithubReviewID string `json:"githubReviewId"`
|
|
CreatedAt time.Time `json:"createdAt"`
|
|
DeliveredAt *time.Time `json:"deliveredAt,omitempty"`
|
|
}
|
|
|
|
// reviewRunResponse mirrors controllers.ReviewRunResponse.
|
|
type reviewRunResponse struct {
|
|
Review reviewRun `json:"review"`
|
|
Reviews []reviewRun `json:"reviews"`
|
|
ReviewerHandleID string `json:"reviewerHandleId"`
|
|
}
|
|
|
|
// submitReviewItem mirrors controllers.SubmitReviewItem.
|
|
type submitReviewItem struct {
|
|
RunID string `json:"runId"`
|
|
Verdict string `json:"verdict"`
|
|
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 {
|
|
session string
|
|
runID string
|
|
verdict string
|
|
body string
|
|
reviewID string
|
|
reviews string
|
|
}
|
|
|
|
func newReviewCommand(ctx *commandContext) *cobra.Command {
|
|
cmd := &cobra.Command{
|
|
Use: "review",
|
|
Short: "Manage AO code reviews of a worker's PR",
|
|
}
|
|
cmd.AddCommand(newReviewSubmitCommand(ctx))
|
|
return cmd
|
|
}
|
|
|
|
func newReviewSubmitCommand(ctx *commandContext) *cobra.Command {
|
|
var opts reviewSubmitOptions
|
|
cmd := &cobra.Command{
|
|
Use: "submit [worker-session-id]",
|
|
Short: "Record a reviewer's result for a worker's PR",
|
|
Args: cobra.MaximumNArgs(1),
|
|
RunE: func(cmd *cobra.Command, args []string) error {
|
|
return ctx.submitReview(cmd, args, opts)
|
|
},
|
|
}
|
|
// Reviewer agents routinely spell flags with underscores (--review_id) rather
|
|
// than hyphens (--review-id); normalize so both resolve to the same flag.
|
|
cmd.Flags().SetNormalizeFunc(func(_ *pflag.FlagSet, name string) pflag.NormalizedName {
|
|
return pflag.NormalizedName(strings.ReplaceAll(name, "_", "-"))
|
|
})
|
|
cmd.Flags().StringVar(&opts.session, "session", "", "Worker session id (or pass it as the positional argument)")
|
|
cmd.Flags().StringVar(&opts.runID, "run", "", "Review run id (required)")
|
|
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
|
|
}
|
|
|
|
func (c *commandContext) submitReview(cmd *cobra.Command, args []string, opts reviewSubmitOptions) error {
|
|
session := strings.TrimSpace(opts.session)
|
|
if len(args) == 1 {
|
|
session = strings.TrimSpace(args[0])
|
|
}
|
|
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")}
|
|
}
|
|
verdict := strings.TrimSpace(opts.verdict)
|
|
if verdict == "" {
|
|
return usageError{errors.New("usage: --verdict is required (approved or changes_requested)")}
|
|
}
|
|
var body string
|
|
if path := strings.TrimSpace(opts.body); path != "" {
|
|
var raw []byte
|
|
var err error
|
|
if path == "-" {
|
|
// Read the review from stdin so the reviewer never has to write a file
|
|
// into its checkout (where it could be committed onto the worker branch).
|
|
raw, err = io.ReadAll(cmd.InOrStdin())
|
|
} else {
|
|
raw, err = os.ReadFile(path)
|
|
}
|
|
if err != nil {
|
|
return usageError{fmt.Errorf("read review body: %w", err)}
|
|
}
|
|
body = string(raw)
|
|
}
|
|
reviewID := strings.TrimSpace(opts.reviewID)
|
|
path := "sessions/" + url.PathEscape(session) + "/reviews/submit"
|
|
var res reviewRunResponse
|
|
if err := c.postJSON(cmd.Context(), path, submitReviewRequest{RunID: runID, Verdict: verdict, Body: body, GithubReviewID: reviewID}, &res); err != nil {
|
|
return err
|
|
}
|
|
_, 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
|
|
}
|