[pull] trunk from cli:trunk

api/queries_pr_test.go

@@ -2,6 +2,8 @@ package api
 
 import (
 	"encoding/json"
+	"fmt"
+	"strings"
 	"testing"
 
 	"github.com/cli/cli/v2/internal/ghrepo"
@@ -136,3 +138,227 @@ func Test_Logins(t *testing.T) {
 		})
 	}
 }
+
+// mockReviewerResponse generates a GraphQL response for SuggestedReviewerActors tests.
+// It creates suggestions (s1, s2...), collaborators (c1, c2...), and teams (team1, team2...).
+// totalCollabs and totalTeams set the unfiltered TotalCount fields (for "more results" calculation).
+func mockReviewerResponse(suggestions, collabs, teams, totalCollabs, totalTeams int) string {
+	var suggestionNodes, collabNodes, teamNodes []string
+
+	for i := 1; i <= suggestions; i++ {
+		suggestionNodes = append(suggestionNodes,
+			fmt.Sprintf(`{"isAuthor": false, "reviewer": {"__typename": "User", "login": "s%d", "name": "S%d"}}`, i, i))
+	}
+	for i := 1; i <= collabs; i++ {
+		collabNodes = append(collabNodes,
+			fmt.Sprintf(`{"login": "c%d", "name": "C%d"}`, i, i))
+	}
+	for i := 1; i <= teams; i++ {
+		teamNodes = append(teamNodes,
+			fmt.Sprintf(`{"slug": "team%d"}`, i))
+	}
+
+	return fmt.Sprintf(`{
+		"data": {
+			"node": {"suggestedReviewerActors": {"nodes": [%s]}},
+			"repository": {
+				"collaborators": {"nodes": [%s]},
+				"collaboratorsTotalCount": {"totalCount": %d}
+			},
+			"organization": {
+				"teams": {"nodes": [%s]},
+				"teamsTotalCount": {"totalCount": %d}
+			}
+		}
+	}`, strings.Join(suggestionNodes, ","), strings.Join(collabNodes, ","), totalCollabs,
+		strings.Join(teamNodes, ","), totalTeams)
+}
+
+func TestSuggestedReviewerActors(t *testing.T) {
+	tests := []struct {
+		name           string
+		httpStubs      func(*httpmock.Registry)
+		expectedCount  int
+		expectedLogins []string
+		expectedMore   int
+		expectError    bool
+	}{
+		{
+			name: "all sources plentiful - 5 each from cascading quota",
+			httpStubs: func(reg *httpmock.Registry) {
+				reg.Register(
+					httpmock.GraphQL(`query SuggestedReviewerActors\b`),
+					httpmock.StringResponse(mockReviewerResponse(6, 6, 6, 20, 10)))
+			},
+			expectedCount:  15,
+			expectedLogins: []string{"s1", "s2", "s3", "s4", "s5", "c1", "c2", "c3", "c4", "c5", "OWNER/team1", "OWNER/team2", "OWNER/team3", "OWNER/team4", "OWNER/team5"},
+			expectedMore:   30,
+		},
+		{
+			name: "few suggestions - collaborators fill gap",
+			httpStubs: func(reg *httpmock.Registry) {
+				reg.Register(
+					httpmock.GraphQL(`query SuggestedReviewerActors\b`),
+					httpmock.StringResponse(mockReviewerResponse(2, 10, 6, 50, 10)))
+			},
+			expectedCount:  15,
+			expectedLogins: []string{"s1", "s2", "c1", "c2", "c3", "c4", "c5", "c6", "c7", "c8", "OWNER/team1", "OWNER/team2", "OWNER/team3", "OWNER/team4", "OWNER/team5"},
+			expectedMore:   60,
+		},
+		{
+			name: "few suggestions and collaborators - teams fill gap",
+			httpStubs: func(reg *httpmock.Registry) {
+				reg.Register(
+					httpmock.GraphQL(`query SuggestedReviewerActors\b`),
+					httpmock.StringResponse(mockReviewerResponse(2, 3, 10, 3, 10)))
+			},
+			expectedCount:  15,
+			expectedLogins: []string{"s1", "s2", "c1", "c2", "c3", "OWNER/team1", "OWNER/team2", "OWNER/team3", "OWNER/team4", "OWNER/team5", "OWNER/team6", "OWNER/team7", "OWNER/team8", "OWNER/team9", "OWNER/team10"},
+			expectedMore:   13,
+		},
+		{
+			name: "no suggestions or collaborators - teams only",
+			httpStubs: func(reg *httpmock.Registry) {
+				reg.Register(
+					httpmock.GraphQL(`query SuggestedReviewerActors\b`),
+					httpmock.StringResponse(mockReviewerResponse(0, 0, 10, 0, 10)))
+			},
+			expectedCount:  10, // max 15, but only 10 teams available
+			expectedLogins: []string{"OWNER/team1", "OWNER/team2", "OWNER/team3", "OWNER/team4", "OWNER/team5", "OWNER/team6", "OWNER/team7", "OWNER/team8", "OWNER/team9", "OWNER/team10"},
+			expectedMore:   10,
+		},
+		{
+			name: "author excluded from suggestions",
+			httpStubs: func(reg *httpmock.Registry) {
+				// Custom response with author flag
+				reg.Register(
+					httpmock.GraphQL(`query SuggestedReviewerActors\b`),
+					httpmock.StringResponse(`{
+						"data": {
+							"node": {"suggestedReviewerActors": {"nodes": [
+								{"isAuthor": true, "reviewer": {"__typename": "User", "login": "author", "name": "Author"}},
+								{"isAuthor": false, "reviewer": {"__typename": "User", "login": "s1", "name": "S1"}},
+								{"isAuthor": false, "reviewer": {"__typename": "User", "login": "s2", "name": "S2"}}
+							]}},
+							"repository": {
+								"collaborators": {"nodes": [{"login": "c1", "name": "C1"}]},
+								"collaboratorsTotalCount": {"totalCount": 5}
+							},
+							"organization": {
+								"teams": {"nodes": [{"slug": "team1"}]},
+								"teamsTotalCount": {"totalCount": 3}
+							}
+						}
+					}`))
+			},
+			expectedCount:  4,
+			expectedLogins: []string{"s1", "s2", "c1", "OWNER/team1"},
+			expectedMore:   8,
+		},
+		{
+			name: "deduplication across sources",
+			httpStubs: func(reg *httpmock.Registry) {
+				// Custom response with duplicate user
+				reg.Register(
+					httpmock.GraphQL(`query SuggestedReviewerActors\b`),
+					httpmock.StringResponse(`{
+						"data": {
+							"node": {"suggestedReviewerActors": {"nodes": [
+								{"isAuthor": false, "reviewer": {"__typename": "User", "login": "shareduser", "name": "Shared"}}
+							]}},
+							"repository": {
+								"collaborators": {"nodes": [
+									{"login": "shareduser", "name": "Shared"},
+									{"login": "c1", "name": "C1"}
+								]},
+								"collaboratorsTotalCount": {"totalCount": 10}
+							},
+							"organization": {
+								"teams": {"nodes": [{"slug": "team1"}]},
+								"teamsTotalCount": {"totalCount": 5}
+							}
+						}
+					}`))
+			},
+			expectedCount:  3,
+			expectedLogins: []string{"shareduser", "c1", "OWNER/team1"},
+			expectedMore:   15,
+		},
+		{
+			name: "personal repo - no organization teams",
+			httpStubs: func(reg *httpmock.Registry) {
+				reg.Register(
+					httpmock.GraphQL(`query SuggestedReviewerActors\b`),
+					httpmock.StringResponse(`{
+						"data": {
+							"node": {"suggestedReviewerActors": {"nodes": [
+								{"isAuthor": false, "reviewer": {"__typename": "User", "login": "s1", "name": "S1"}}
+							]}},
+							"repository": {
+								"collaborators": {"nodes": [{"login": "c1", "name": "C1"}]},
+								"collaboratorsTotalCount": {"totalCount": 3}
+							},
+							"organization": null
+						},
+						"errors": [{"message": "Could not resolve to an Organization with the login of 'OWNER'."}]
+					}`))
+			},
+			expectedCount:  2,
+			expectedLogins: []string{"s1", "c1"},
+			expectedMore:   3,
+		},
+		{
+			name: "bot reviewer included",
+			httpStubs: func(reg *httpmock.Registry) {
+				reg.Register(
+					httpmock.GraphQL(`query SuggestedReviewerActors\b`),
+					httpmock.StringResponse(`{
+						"data": {
+							"node": {"suggestedReviewerActors": {"nodes": [
+								{"isAuthor": false, "reviewer": {"__typename": "Bot", "login": "copilot-pull-request-reviewer"}},
+								{"isAuthor": false, "reviewer": {"__typename": "User", "login": "s1", "name": "S1"}}
+							]}},
+							"repository": {
+								"collaborators": {"nodes": []},
+								"collaboratorsTotalCount": {"totalCount": 5}
+							},
+							"organization": {
+								"teams": {"nodes": []},
+								"teamsTotalCount": {"totalCount": 0}
+							}
+						}
+					}`))
+			},
+			expectedCount:  2,
+			expectedLogins: []string{"copilot-pull-request-reviewer", "s1"},
+			expectedMore:   5,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			reg := &httpmock.Registry{}
+			if tt.httpStubs != nil {
+				tt.httpStubs(reg)
+			}
+
+			client := newTestClient(reg)
+			repo, _ := ghrepo.FromFullName("OWNER/REPO")
+
+			candidates, moreResults, err := SuggestedReviewerActors(client, repo, "PR_123", "")
+			if tt.expectError {
+				assert.Error(t, err)
+				return
+			}
+			assert.NoError(t, err)
+			assert.Equal(t, tt.expectedCount, len(candidates), "candidate count mismatch")
+			assert.Equal(t, tt.expectedMore, moreResults, "moreResults mismatch")
+
+			logins := make([]string, len(candidates))
+			for i, c := range candidates {
+				logins[i] = c.Login()
+			}
+			assert.Equal(t, tt.expectedLogins, logins)
+		})
+	}
+}

api/queries_repo.go

@@ -1080,10 +1080,11 @@ func RepoProjects(client *Client, repo ghrepo.Interface) ([]RepoProject, error)
 	return projects, nil
 }
 
-// Expected login for Copilot when retrieved as an Actor
-// This is returned from assignable actors and issue/pr assigned actors.
-// We use this to check if the actor is Copilot.
-const CopilotActorLogin = "copilot-swe-agent"
+// Expected login for Copilot when retrieved as an assignee
+const CopilotAssigneeLogin = "copilot-swe-agent"
+
+// Expected login for Copilot when retrieved as a Pull Request Reviewer.
+const CopilotReviewerLogin = "copilot-pull-request-reviewer"
 const CopilotActorName = "Copilot"
 
 type AssignableActor interface {
@@ -1144,7 +1145,7 @@ func NewAssignableBot(id, login string) AssignableBot {
 }
 
 func (b AssignableBot) DisplayName() string {
-	if b.login == CopilotActorLogin {
+	if b.login == CopilotAssigneeLogin {
 		return fmt.Sprintf("%s (AI)", CopilotActorName)
 	}
 	return b.Login()

api/query_builder.go

@@ -94,12 +94,16 @@ var issueClosedByPullRequestsReferences = shortenQuery(`
 	}
 `)
 
+// prReviewRequests includes ...on Bot to support Copilot as a reviewer on github.com.
+// On GHES, Bot is not part of the RequestedReviewer union, but the fragment is
+// silently ignored (verified on GHES 3.19).
 var prReviewRequests = shortenQuery(`
 	reviewRequests(first: 100) {
 		nodes {
 			requestedReviewer {
 				__typename,
-				...on User{login},
+				...on User{login,name},
+				...on Bot{login},
 				...on Team{
 					organization{login}
 					name,

go.mod

@@ -1,6 +1,6 @@
 module github.com/cli/cli/v2
 
-go 1.25.6
+go 1.25.7
 
 require (
 	github.com/AlecAivazis/survey/v2 v2.3.7
@@ -50,10 +50,10 @@ require (
 	github.com/vmihailenco/msgpack/v5 v5.4.1
 	github.com/yuin/goldmark v1.7.16
 	github.com/zalando/go-keyring v0.2.6
-	golang.org/x/crypto v0.46.0
+	golang.org/x/crypto v0.47.0
 	golang.org/x/sync v0.19.0
-	golang.org/x/term v0.38.0
-	golang.org/x/text v0.32.0
+	golang.org/x/term v0.39.0
+	golang.org/x/text v0.33.0
 	google.golang.org/grpc v1.78.0
 	google.golang.org/protobuf v1.36.11
 	gopkg.in/h2non/gock.v1 v1.1.2
@@ -177,10 +177,10 @@ require (
 	go.opentelemetry.io/otel/metric v1.38.0 // indirect
 	go.opentelemetry.io/otel/trace v1.38.0 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
-	golang.org/x/mod v0.30.0 // indirect
+	golang.org/x/mod v0.31.0 // indirect
 	golang.org/x/net v0.48.0 // indirect
-	golang.org/x/sys v0.39.0 // indirect
-	golang.org/x/tools v0.39.0 // indirect
+	golang.org/x/sys v0.40.0 // indirect
+	golang.org/x/tools v0.40.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b // indirect
 )

go.sum

@@ -572,14 +572,14 @@ go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
 go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.46.0 h1:cKRW/pmt1pKAfetfu+RCEvjvZkA9RimPbh7bhFjGVBU=
-golang.org/x/crypto v0.46.0/go.mod h1:Evb/oLKmMraqjZ2iQTwDwvCtJkczlDuTmdJXoZVzqU0=
+golang.org/x/crypto v0.47.0 h1:V6e3FRj+n4dbpw86FJ8Fv7XVOql7TEwpHapKoMJ/GO8=
+golang.org/x/crypto v0.47.0/go.mod h1:ff3Y9VzzKbwSSEzWqJsJVBnWmRwRSHt/6Op5n9bQc4A=
 golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b h1:M2rDM6z3Fhozi9O7NWsxAkg/yqS/lQJ6PmkyIV3YP+o=
 golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b/go.mod h1:3//PLf8L/X+8b4vuAfHzxeRUl04Adcb341+IGKfnqS8=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.30.0 h1:fDEXFVZ/fmCKProc/yAXXUijritrDzahmwwefnjoPFk=
-golang.org/x/mod v0.30.0/go.mod h1:lAsf5O2EvJeSFMiBxXDki7sCgAxEUcZHXoXMKT4GJKc=
+golang.org/x/mod v0.31.0 h1:HaW9xtz0+kOcWKwli0ZXy79Ix+UW/vOfmWI5QVd2tgI=
+golang.org/x/mod v0.31.0/go.mod h1:43JraMp9cGx1Rx3AqioxrbrhNsLl2l/iNAvuBkrezpg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
@@ -604,29 +604,29 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
-golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ=
+golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.38.0 h1:PQ5pkm/rLO6HnxFR7N2lJHOZX6Kez5Y1gDSJla6jo7Q=
-golang.org/x/term v0.38.0/go.mod h1:bSEAKrOT1W+VSu9TSCMtoGEOUcKxOKgl3LE5QEF/xVg=
+golang.org/x/term v0.39.0 h1:RclSuaJf32jOqZz74CkPA9qFuVTX7vhLlpfj/IGWlqY=
+golang.org/x/term v0.39.0/go.mod h1:yxzUCTP/U+FzoxfdKmLaA0RV1WgE0VY7hXBwKtY/4ww=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
-golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
+golang.org/x/text v0.33.0 h1:B3njUFyqtHDUI5jMn1YIr5B0IE2U0qck04r6d4KPAxE=
+golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8=
 golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI=
 golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.39.0 h1:ik4ho21kwuQln40uelmciQPp9SipgNDdrafrYA4TmQQ=
-golang.org/x/tools v0.39.0/go.mod h1:JnefbkDPyD8UU2kI5fuf8ZX4/yUeh9W877ZeBONxUqQ=
+golang.org/x/tools v0.40.0 h1:yLkxfA+Qnul4cs9QA3KnlFu0lVmd8JJfoq+E41uSutA=
+golang.org/x/tools v0.40.0/go.mod h1:Ik/tzLRlbscWpqqMRjyWYDisX8bG13FrdXp3o4Sr9lc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
 gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=