From 04bc0d27f4414a5e3d9224e606203b6ce600be3d Mon Sep 17 00:00:00 2001
From: Kynan Ware <47394200+BagToad@users.noreply.github.com>
Date: Fri, 6 Mar 2026 10:58:57 -0700
Subject: [PATCH 1/4] Show friendly Copilot (AI) name in gh pr view
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add CopilotDisplayName helper that translates known Copilot bot
logins (copilot-pull-request-reviewer, copilot-swe-agent) to the
friendly 'Copilot (AI)' display name. Applied to:

- PullRequestReview.AuthorLogin() — review comment author
- Comment.AuthorLogin() — PR/issue comment author
- parseReviewers() in pr view — reviewer list display

This ensures gh pr view shows 'Copilot (AI)' instead of the raw
'copilot-pull-request-reviewer' login for both the reviewer status
line and any review comments left by Copilot.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 api/queries_comments.go  |  2 +-
 api/queries_pr_review.go | 12 +++++-------
 api/queries_repo.go      | 15 +++++++++++----
 api/queries_repo_test.go | 20 ++++++++++++++++++++
 pkg/cmd/pr/view/view.go  |  4 ++--
 5 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/api/queries_comments.go b/api/queries_comments.go
index 8af17fd2ae6..b0450c0681c 100644
--- a/api/queries_comments.go
+++ b/api/queries_comments.go
@@ -129,7 +129,7 @@ func (c Comment) Identifier() string {
 }
 
 func (c Comment) AuthorLogin() string {
-	return c.Author.Login
+	return copilotDisplayName(c.Author.Login)
 }
 
 func (c Comment) Association() string {
diff --git a/api/queries_pr_review.go b/api/queries_pr_review.go
index a6fa34f9e88..7f23f8b5e40 100644
--- a/api/queries_pr_review.go
+++ b/api/queries_pr_review.go
@@ -52,7 +52,7 @@ func (prr PullRequestReview) Identifier() string {
 }
 
 func (prr PullRequestReview) AuthorLogin() string {
-	return prr.Author.Login
+	return copilotDisplayName(prr.Author.Login)
 }
 
 func (prr PullRequestReview) Association() string {
@@ -158,8 +158,9 @@ func (r RequestedReviewer) DisplayName() string {
 	if r.TypeName == teamTypeName {
 		return fmt.Sprintf("%s/%s", r.Organization.Login, r.Slug)
 	}
-	if r.TypeName == botTypeName && r.Login == CopilotReviewerLogin {
-		return "Copilot (AI)"
+	displayName := copilotDisplayName(r.Login)
+	if displayName != r.Login {
+		return displayName
 	}
 	if r.Name != "" {
 		return fmt.Sprintf("%s (%s)", r.Login, r.Name)
@@ -221,10 +222,7 @@ func NewReviewerBot(login string) ReviewerBot {
 }
 
 func (b ReviewerBot) DisplayName() string {
-	if b.login == CopilotReviewerLogin {
-		return fmt.Sprintf("%s (AI)", CopilotActorName)
-	}
-	return b.Login()
+	return copilotDisplayName(b.login)
 }
 
 func (r ReviewerBot) sealedReviewerCandidate() {}
diff --git a/api/queries_repo.go b/api/queries_repo.go
index d8ffa191dfc..31dbf75f18c 100644
--- a/api/queries_repo.go
+++ b/api/queries_repo.go
@@ -1087,6 +1087,16 @@ const CopilotAssigneeLogin = "copilot-swe-agent"
 const CopilotReviewerLogin = "copilot-pull-request-reviewer"
 const CopilotActorName = "Copilot"
 
+// copilotDisplayName returns "Copilot (AI)" if the login is a known Copilot bot login,
+// otherwise returns the login unchanged. Use this to translate raw bot logins into
+// user-friendly display names in command output.
+func copilotDisplayName(login string) string {
+	if login == CopilotReviewerLogin || login == CopilotAssigneeLogin {
+		return fmt.Sprintf("%s (AI)", CopilotActorName)
+	}
+	return login
+}
+
 type AssignableActor interface {
 	DisplayName() string
 	ID() string
@@ -1145,10 +1155,7 @@ func NewAssignableBot(id, login string) AssignableBot {
 }
 
 func (b AssignableBot) DisplayName() string {
-	if b.login == CopilotAssigneeLogin {
-		return fmt.Sprintf("%s (AI)", CopilotActorName)
-	}
-	return b.Login()
+	return copilotDisplayName(b.login)
 }
 
 func (b AssignableBot) ID() string {
diff --git a/api/queries_repo_test.go b/api/queries_repo_test.go
index ad0b8e8572a..928a9e885a4 100644
--- a/api/queries_repo_test.go
+++ b/api/queries_repo_test.go
@@ -563,6 +563,26 @@ func TestDisplayName(t *testing.T) {
 	}
 }
 
+func TestCopilotDisplayName(t *testing.T) {
+	tests := []struct {
+		login string
+		want  string
+	}{
+		{login: "copilot-pull-request-reviewer", want: "Copilot (AI)"},
+		{login: "copilot-swe-agent", want: "Copilot (AI)"},
+		{login: "octocat", want: "octocat"},
+		{login: "", want: ""},
+	}
+	for _, tt := range tests {
+		t.Run(tt.login, func(t *testing.T) {
+			got := copilotDisplayName(tt.login)
+			if got != tt.want {
+				t.Errorf("copilotDisplayName(%q) = %q, want %q", tt.login, got, tt.want)
+			}
+		})
+	}
+}
+
 func TestRepoExists(t *testing.T) {
 	tests := []struct {
 		name       string
diff --git a/pkg/cmd/pr/view/view.go b/pkg/cmd/pr/view/view.go
index 564cce9132e..e6ae63a10e9 100644
--- a/pkg/cmd/pr/view/view.go
+++ b/pkg/cmd/pr/view/view.go
@@ -351,7 +351,7 @@ func parseReviewers(pr api.PullRequest) []*reviewerState {
 
 	for _, review := range pr.Reviews.Nodes {
 		if review.Author.Login != pr.Author.Login {
-			name := review.Author.Login
+			name := review.AuthorLogin()
 			if name == "" {
 				name = ghostName
 			}
@@ -364,7 +364,7 @@ func parseReviewers(pr api.PullRequest) []*reviewerState {
 
 	// Overwrite reviewer's state if a review request for the same reviewer exists.
 	for _, reviewRequest := range pr.ReviewRequests.Nodes {
-		name := reviewRequest.RequestedReviewer.LoginOrSlug()
+		name := reviewRequest.RequestedReviewer.DisplayName()
 		reviewerStates[name] = &reviewerState{
 			Name:  name,
 			State: requestedReviewState,

From 7198d270b4e39f7991a7b7894d9bfb69d2744a50 Mon Sep 17 00:00:00 2001
From: Kynan Ware <47394200+BagToad@users.noreply.github.com>
Date: Fri, 6 Mar 2026 11:31:38 -0700
Subject: [PATCH 2/4] Add generic actorDisplayName for all actor display names
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Replace copilotDisplayName with actorDisplayName(typeName, login, name)
which handles all actor types: known bots get friendly names (e.g.
Copilot → 'Copilot (AI)'), regular bots return login, users with
names return 'login (Name)', others return login.

All DisplayName() methods on Author, CommentAuthor, GitHubUser,
AssignableUser, AssignableBot, RequestedReviewer, and ReviewerBot
now delegate to actorDisplayName with their available fields.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 api/queries_comments.go  |  2 +-
 api/queries_issue.go     | 10 ++++++++++
 api/queries_pr_review.go | 18 +++++-------------
 api/queries_repo.go      | 32 +++++++++++++++++++++-----------
 api/queries_repo_test.go | 28 ++++++++++++++++++----------
 pkg/cmd/pr/view/view.go  |  6 +++---
 6 files changed, 58 insertions(+), 38 deletions(-)

diff --git a/api/queries_comments.go b/api/queries_comments.go
index b0450c0681c..bb1e9b2871c 100644
--- a/api/queries_comments.go
+++ b/api/queries_comments.go
@@ -129,7 +129,7 @@ func (c Comment) Identifier() string {
 }
 
 func (c Comment) AuthorLogin() string {
-	return copilotDisplayName(c.Author.Login)
+	return c.Author.DisplayName()
 }
 
 func (c Comment) Association() string {
diff --git a/api/queries_issue.go b/api/queries_issue.go
index 1a8e082ad8f..d545ef59f85 100644
--- a/api/queries_issue.go
+++ b/api/queries_issue.go
@@ -234,6 +234,11 @@ type Author struct {
 	Login string
 }
 
+// DisplayName returns a user-friendly name via actorDisplayName.
+func (a Author) DisplayName() string {
+	return actorDisplayName("", a.Login, a.Name)
+}
+
 func (author Author) MarshalJSON() ([]byte, error) {
 	if author.ID == "" {
 		return json.Marshal(map[string]interface{}{
@@ -260,6 +265,11 @@ type CommentAuthor struct {
 	//	} `graphql:"... on User"`
 }
 
+// DisplayName returns a user-friendly name via actorDisplayName.
+func (a CommentAuthor) DisplayName() string {
+	return actorDisplayName("", a.Login, "")
+}
+
 // IssueCreate creates an issue in a GitHub repository
 func IssueCreate(client *Client, repo *Repository, params map[string]interface{}) (*Issue, error) {
 	query := `
diff --git a/api/queries_pr_review.go b/api/queries_pr_review.go
index 7f23f8b5e40..48e7582566e 100644
--- a/api/queries_pr_review.go
+++ b/api/queries_pr_review.go
@@ -52,7 +52,7 @@ func (prr PullRequestReview) Identifier() string {
 }
 
 func (prr PullRequestReview) AuthorLogin() string {
-	return copilotDisplayName(prr.Author.Login)
+	return prr.Author.DisplayName()
 }
 
 func (prr PullRequestReview) Association() string {
@@ -151,21 +151,13 @@ func (r RequestedReviewer) LoginOrSlug() string {
 	return r.Login
 }
 
-// DisplayName returns a user-friendly name for the reviewer.
-// For Copilot bot, returns "Copilot (AI)". For teams, returns "org/slug".
-// For users, returns "login (Name)" if name is available, otherwise just login.
+// DisplayName returns a user-friendly name for the reviewer via actorDisplayName.
+// Teams are handled separately as "org/slug".
 func (r RequestedReviewer) DisplayName() string {
 	if r.TypeName == teamTypeName {
 		return fmt.Sprintf("%s/%s", r.Organization.Login, r.Slug)
 	}
-	displayName := copilotDisplayName(r.Login)
-	if displayName != r.Login {
-		return displayName
-	}
-	if r.Name != "" {
-		return fmt.Sprintf("%s (%s)", r.Login, r.Name)
-	}
-	return r.Login
+	return actorDisplayName(r.TypeName, r.Login, r.Name)
 }
 
 func (r ReviewRequests) Logins() []string {
@@ -222,7 +214,7 @@ func NewReviewerBot(login string) ReviewerBot {
 }
 
 func (b ReviewerBot) DisplayName() string {
-	return copilotDisplayName(b.login)
+	return actorDisplayName("Bot", b.login, "")
 }
 
 func (r ReviewerBot) sealedReviewerCandidate() {}
diff --git a/api/queries_repo.go b/api/queries_repo.go
index 31dbf75f18c..d4077eea9ca 100644
--- a/api/queries_repo.go
+++ b/api/queries_repo.go
@@ -147,6 +147,11 @@ type GitHubUser struct {
 	DatabaseID int64  `json:"databaseId"`
 }
 
+// DisplayName returns a user-friendly name via actorDisplayName.
+func (u GitHubUser) DisplayName() string {
+	return actorDisplayName("", u.Login, u.Name)
+}
+
 // Actor is a superset of User and Bot, among others.
 // At the time of writing, some of these fields
 // are not directly supported by the Actor type and
@@ -1087,13 +1092,21 @@ const CopilotAssigneeLogin = "copilot-swe-agent"
 const CopilotReviewerLogin = "copilot-pull-request-reviewer"
 const CopilotActorName = "Copilot"
 
-// copilotDisplayName returns "Copilot (AI)" if the login is a known Copilot bot login,
-// otherwise returns the login unchanged. Use this to translate raw bot logins into
-// user-friendly display names in command output.
-func copilotDisplayName(login string) string {
-	if login == CopilotReviewerLogin || login == CopilotAssigneeLogin {
+// actorDisplayName returns a user-friendly display name for any actor.
+// It handles bots (e.g. Copilot → "Copilot (AI)"), users with names
+// ("login (Name)"), and falls back to just login. Empty typeName is
+// treated as a possible bot or user — the login is checked against
+// known bot logins first.
+func actorDisplayName(typeName, login, name string) string {
+	if login == CopilotReviewerLogin || login == CopilotAssigneeLogin || login == CopilotActorName {
 		return fmt.Sprintf("%s (AI)", CopilotActorName)
 	}
+	if typeName == botTypeName {
+		return login
+	}
+	if name != "" {
+		return fmt.Sprintf("%s (%s)", login, name)
+	}
 	return login
 }
 
@@ -1120,12 +1133,9 @@ func NewAssignableUser(id, login, name string) AssignableUser {
 	}
 }
 
-// DisplayName returns a formatted string that uses Login and Name to be displayed e.g. 'Login (Name)' or 'Login'
+// DisplayName returns a user-friendly name via actorDisplayName.
 func (u AssignableUser) DisplayName() string {
-	if u.name != "" {
-		return fmt.Sprintf("%s (%s)", u.login, u.name)
-	}
-	return u.login
+	return actorDisplayName("User", u.login, u.name)
 }
 
 func (u AssignableUser) ID() string {
@@ -1155,7 +1165,7 @@ func NewAssignableBot(id, login string) AssignableBot {
 }
 
 func (b AssignableBot) DisplayName() string {
-	return copilotDisplayName(b.login)
+	return actorDisplayName("Bot", b.login, "")
 }
 
 func (b AssignableBot) ID() string {
diff --git a/api/queries_repo_test.go b/api/queries_repo_test.go
index 928a9e885a4..a45c26f8ca1 100644
--- a/api/queries_repo_test.go
+++ b/api/queries_repo_test.go
@@ -563,21 +563,29 @@ func TestDisplayName(t *testing.T) {
 	}
 }
 
-func TestCopilotDisplayName(t *testing.T) {
+func TestActorDisplayName(t *testing.T) {
 	tests := []struct {
-		login string
-		want  string
+		name     string
+		typeName string
+		login    string
+		actName  string
+		want     string
 	}{
-		{login: "copilot-pull-request-reviewer", want: "Copilot (AI)"},
-		{login: "copilot-swe-agent", want: "Copilot (AI)"},
-		{login: "octocat", want: "octocat"},
-		{login: "", want: ""},
+		{name: "copilot reviewer", typeName: "Bot", login: "copilot-pull-request-reviewer", want: "Copilot (AI)"},
+		{name: "copilot assignee", typeName: "Bot", login: "copilot-swe-agent", want: "Copilot (AI)"},
+		{name: "copilot without typename", typeName: "", login: "copilot-pull-request-reviewer", want: "Copilot (AI)"},
+		{name: "copilot actor name login", typeName: "", login: "Copilot", want: "Copilot (AI)"},
+		{name: "regular bot", typeName: "Bot", login: "dependabot", want: "dependabot"},
+		{name: "user with name", typeName: "User", login: "octocat", actName: "Mona Lisa", want: "octocat (Mona Lisa)"},
+		{name: "user without name", typeName: "User", login: "octocat", want: "octocat"},
+		{name: "unknown type with name", typeName: "", login: "octocat", actName: "Mona Lisa", want: "octocat (Mona Lisa)"},
+		{name: "empty login", typeName: "", login: "", want: ""},
 	}
 	for _, tt := range tests {
-		t.Run(tt.login, func(t *testing.T) {
-			got := copilotDisplayName(tt.login)
+		t.Run(tt.name, func(t *testing.T) {
+			got := actorDisplayName(tt.typeName, tt.login, tt.actName)
 			if got != tt.want {
-				t.Errorf("copilotDisplayName(%q) = %q, want %q", tt.login, got, tt.want)
+				t.Errorf("actorDisplayName(%q, %q, %q) = %q, want %q", tt.typeName, tt.login, tt.actName, got, tt.want)
 			}
 		})
 	}
diff --git a/pkg/cmd/pr/view/view.go b/pkg/cmd/pr/view/view.go
index e6ae63a10e9..6e6859bc035 100644
--- a/pkg/cmd/pr/view/view.go
+++ b/pkg/cmd/pr/view/view.go
@@ -149,7 +149,7 @@ func printRawPrPreview(io *iostreams.IOStreams, pr *api.PullRequest) error {
 
 	fmt.Fprintf(out, "title:\t%s\n", pr.Title)
 	fmt.Fprintf(out, "state:\t%s\n", prStateWithDraft(pr))
-	fmt.Fprintf(out, "author:\t%s\n", pr.Author.Login)
+	fmt.Fprintf(out, "author:\t%s\n", pr.Author.DisplayName())
 	fmt.Fprintf(out, "labels:\t%s\n", labels)
 	fmt.Fprintf(out, "assignees:\t%s\n", assignees)
 	fmt.Fprintf(out, "reviewers:\t%s\n", reviewers)
@@ -188,7 +188,7 @@ func printHumanPrPreview(opts *ViewOptions, baseRepo ghrepo.Interface, pr *api.P
 	fmt.Fprintf(out,
 		"%s • %s wants to merge %s into %s from %s • %s\n",
 		shared.StateTitleWithColor(cs, *pr),
-		pr.Author.Login,
+		pr.Author.DisplayName(),
 		text.Pluralize(pr.Commits.TotalCount, "commit"),
 		pr.BaseRefName,
 		pr.HeadRefName,
@@ -406,7 +406,7 @@ func prAssigneeList(pr api.PullRequest) string {
 
 	AssigneeNames := make([]string, 0, len(pr.Assignees.Nodes))
 	for _, assignee := range pr.Assignees.Nodes {
-		AssigneeNames = append(AssigneeNames, assignee.Login)
+		AssigneeNames = append(AssigneeNames, assignee.DisplayName())
 	}
 
 	list := strings.Join(AssigneeNames, ", ")

From 3651c289ed15a4307df51e03f386ad77afa9a2b8 Mon Sep 17 00:00:00 2001
From: Kynan Ware <47394200+BagToad@users.noreply.github.com>
Date: Fri, 6 Mar 2026 12:01:06 -0700
Subject: [PATCH 3/4] Show friendly display names in gh issue view

Apply DisplayName() to author and assignee display in issue view,
consistent with the pr view changes.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 pkg/cmd/issue/view/view.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/cmd/issue/view/view.go b/pkg/cmd/issue/view/view.go
index e41ad6acffe..5add5a71b1e 100644
--- a/pkg/cmd/issue/view/view.go
+++ b/pkg/cmd/issue/view/view.go
@@ -197,7 +197,7 @@ func printRawIssuePreview(out io.Writer, issue *api.Issue) error {
 	// processing many issues with head and grep.
 	fmt.Fprintf(out, "title:\t%s\n", issue.Title)
 	fmt.Fprintf(out, "state:\t%s\n", issue.State)
-	fmt.Fprintf(out, "author:\t%s\n", issue.Author.Login)
+	fmt.Fprintf(out, "author:\t%s\n", issue.Author.DisplayName())
 	fmt.Fprintf(out, "labels:\t%s\n", labels)
 	fmt.Fprintf(out, "comments:\t%d\n", issue.Comments.TotalCount)
 	fmt.Fprintf(out, "assignees:\t%s\n", assignees)
@@ -222,7 +222,7 @@ func printHumanIssuePreview(opts *ViewOptions, baseRepo ghrepo.Interface, issue
 	fmt.Fprintf(out,
 		"%s • %s opened %s • %s\n",
 		issueStateTitleWithColor(cs, issue),
-		issue.Author.Login,
+		issue.Author.DisplayName(),
 		text.FuzzyAgo(opts.Now(), issue.CreatedAt),
 		text.Pluralize(issue.Comments.TotalCount, "comment"),
 	)
@@ -298,7 +298,7 @@ func issueAssigneeList(issue api.Issue) string {
 
 	AssigneeNames := make([]string, 0, len(issue.Assignees.Nodes))
 	for _, assignee := range issue.Assignees.Nodes {
-		AssigneeNames = append(AssigneeNames, assignee.Login)
+		AssigneeNames = append(AssigneeNames, assignee.DisplayName())
 	}
 
 	list := strings.Join(AssigneeNames, ", ")

From e047fa6b0e9435cc8382867fc808a7ae9ccc05c1 Mon Sep 17 00:00:00 2001
From: Kynan Ware <47394200+BagToad@users.noreply.github.com>
Date: Fri, 6 Mar 2026 20:36:46 -0700
Subject: [PATCH 4/4] Address review comments: use actorDisplayName for Copilot
 author display

- Add actorDisplayName call in CommentAuthor.DisplayName for consistency
- Use require.Equal in TestActorDisplayName instead of manual comparisons
- Simplify user type name constant usage

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 api/queries_pr_review.go | 1 +
 api/queries_repo.go      | 4 ++--
 api/queries_repo_test.go | 5 +----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/api/queries_pr_review.go b/api/queries_pr_review.go
index 48e7582566e..b0a602bf4c9 100644
--- a/api/queries_pr_review.go
+++ b/api/queries_pr_review.go
@@ -143,6 +143,7 @@ type RequestedReviewer struct {
 
 const teamTypeName = "Team"
 const botTypeName = "Bot"
+const userTypeName = "User"
 
 func (r RequestedReviewer) LoginOrSlug() string {
 	if r.TypeName == teamTypeName {
diff --git a/api/queries_repo.go b/api/queries_repo.go
index d4077eea9ca..d358255d8b9 100644
--- a/api/queries_repo.go
+++ b/api/queries_repo.go
@@ -1135,7 +1135,7 @@ func NewAssignableUser(id, login, name string) AssignableUser {
 
 // DisplayName returns a user-friendly name via actorDisplayName.
 func (u AssignableUser) DisplayName() string {
-	return actorDisplayName("User", u.login, u.name)
+	return actorDisplayName(userTypeName, u.login, u.name)
 }
 
 func (u AssignableUser) ID() string {
@@ -1165,7 +1165,7 @@ func NewAssignableBot(id, login string) AssignableBot {
 }
 
 func (b AssignableBot) DisplayName() string {
-	return actorDisplayName("Bot", b.login, "")
+	return actorDisplayName(botTypeName, b.login, "")
 }
 
 func (b AssignableBot) ID() string {
diff --git a/api/queries_repo_test.go b/api/queries_repo_test.go
index a45c26f8ca1..ae00a98b217 100644
--- a/api/queries_repo_test.go
+++ b/api/queries_repo_test.go
@@ -583,10 +583,7 @@ func TestActorDisplayName(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got := actorDisplayName(tt.typeName, tt.login, tt.actName)
-			if got != tt.want {
-				t.Errorf("actorDisplayName(%q, %q, %q) = %q, want %q", tt.typeName, tt.login, tt.actName, got, tt.want)
-			}
+			require.Equal(t, tt.want, actorDisplayName(tt.typeName, tt.login, tt.actName))
 		})
 	}
 }