From ea5087c5f2f913cbb0d76ba8fc18723f0cbe32b0 Mon Sep 17 00:00:00 2001
From: tommaso-moro <tommaso-moro@github.com>
Date: Tue, 17 Feb 2026 12:06:18 +0000
Subject: [PATCH] use minimal types for issue comments to optimize context
 usage

---
 pkg/github/issues.go        |  8 +++----
 pkg/github/issues_test.go   |  8 +++----
 pkg/github/minimal_types.go | 45 +++++++++++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 8 deletions(-)

diff --git a/pkg/github/issues.go b/pkg/github/issues.go
index dcdec6d45..cd7085550 100644
--- a/pkg/github/issues.go
+++ b/pkg/github/issues.go
@@ -433,12 +433,12 @@ func GetIssueComments(ctx context.Context, client *github.Client, deps ToolDepen
 		comments = filteredComments
 	}
 
-	r, err := json.Marshal(comments)
-	if err != nil {
-		return nil, fmt.Errorf("failed to marshal response: %w", err)
+	minimalComments := make([]MinimalIssueComment, 0, len(comments))
+	for _, comment := range comments {
+		minimalComments = append(minimalComments, convertToMinimalIssueComment(comment))
 	}
 
-	return utils.NewToolResultText(string(r)), nil
+	return MarshalledTextResult(minimalComments), nil
 }
 
 func GetSubIssues(ctx context.Context, client *github.Client, deps ToolDependencies, owner string, repo string, issueNumber int, pagination PaginationParams) (*mcp.CallToolResult, error) {
diff --git a/pkg/github/issues_test.go b/pkg/github/issues_test.go
index c8ff34843..512ba8a6b 100644
--- a/pkg/github/issues_test.go
+++ b/pkg/github/issues_test.go
@@ -2020,16 +2020,16 @@ func Test_GetIssueComments(t *testing.T) {
 			textContent := getTextResult(t, result)
 
 			// Unmarshal and verify the result
-			var returnedComments []*github.IssueComment
+			var returnedComments []MinimalIssueComment
 			err = json.Unmarshal([]byte(textContent.Text), &returnedComments)
 			require.NoError(t, err)
 			assert.Equal(t, len(tc.expectedComments), len(returnedComments))
 			for i := range tc.expectedComments {
 				require.NotNil(t, tc.expectedComments[i].User)
 				require.NotNil(t, returnedComments[i].User)
-				assert.Equal(t, tc.expectedComments[i].GetID(), returnedComments[i].GetID())
-				assert.Equal(t, tc.expectedComments[i].GetBody(), returnedComments[i].GetBody())
-				assert.Equal(t, tc.expectedComments[i].GetUser().GetLogin(), returnedComments[i].GetUser().GetLogin())
+				assert.Equal(t, tc.expectedComments[i].GetID(), returnedComments[i].ID)
+				assert.Equal(t, tc.expectedComments[i].GetBody(), returnedComments[i].Body)
+				assert.Equal(t, tc.expectedComments[i].GetUser().GetLogin(), returnedComments[i].User.Login)
 			}
 		})
 	}
diff --git a/pkg/github/minimal_types.go b/pkg/github/minimal_types.go
index 4031bfa2c..2010f5610 100644
--- a/pkg/github/minimal_types.go
+++ b/pkg/github/minimal_types.go
@@ -173,6 +173,18 @@ type MinimalIssue struct {
 	IssueType         string            `json:"issue_type,omitempty"`
 }
 
+// MinimalIssueComment is the trimmed output type for issue comment objects to reduce verbosity.
+type MinimalIssueComment struct {
+	ID                int64             `json:"id"`
+	Body              string            `json:"body,omitempty"`
+	HTMLURL           string            `json:"html_url"`
+	User              *MinimalUser      `json:"user,omitempty"`
+	AuthorAssociation string            `json:"author_association,omitempty"`
+	Reactions         *MinimalReactions `json:"reactions,omitempty"`
+	CreatedAt         string            `json:"created_at,omitempty"`
+	UpdatedAt         string            `json:"updated_at,omitempty"`
+}
+
 // MinimalPullRequest is the trimmed output type for pull request objects to reduce verbosity.
 type MinimalPullRequest struct {
 	Number             int              `json:"number"`
@@ -283,6 +295,39 @@ func convertToMinimalIssue(issue *github.Issue) MinimalIssue {
 	return m
 }
 
+func convertToMinimalIssueComment(comment *github.IssueComment) MinimalIssueComment {
+	m := MinimalIssueComment{
+		ID:                comment.GetID(),
+		Body:              comment.GetBody(),
+		HTMLURL:           comment.GetHTMLURL(),
+		User:              convertToMinimalUser(comment.GetUser()),
+		AuthorAssociation: comment.GetAuthorAssociation(),
+	}
+
+	if comment.CreatedAt != nil {
+		m.CreatedAt = comment.CreatedAt.Format(time.RFC3339)
+	}
+	if comment.UpdatedAt != nil {
+		m.UpdatedAt = comment.UpdatedAt.Format(time.RFC3339)
+	}
+
+	if r := comment.Reactions; r != nil {
+		m.Reactions = &MinimalReactions{
+			TotalCount: r.GetTotalCount(),
+			PlusOne:    r.GetPlusOne(),
+			MinusOne:   r.GetMinusOne(),
+			Laugh:      r.GetLaugh(),
+			Confused:   r.GetConfused(),
+			Heart:      r.GetHeart(),
+			Hooray:     r.GetHooray(),
+			Rocket:     r.GetRocket(),
+			Eyes:       r.GetEyes(),
+		}
+	}
+
+	return m
+}
+
 func convertToMinimalPullRequest(pr *github.PullRequest) MinimalPullRequest {
 	m := MinimalPullRequest{
 		Number:         pr.GetNumber(),