Include custom issue field values in list_issues response

Adds Issues 2.0 custom field values to each issue returned by the list_issues GraphQL query, exposed on MinimalIssue as field_values: [{field, value}]. Filtering by field is a separate concern (needs the GraphQL IssueFilters input updated upstream) and is not included here. shurcooL/graphql's response decoder walks every inline fragment of a union regardless of __typename, so IssueFieldNumberValue.value is aliased to valueNumber to avoid a Float-vs-String type clash when the runtime variant is, e.g., a SingleSelectValue.
SamMorrowDrums · May 20, 2026 · May 13, 2026 · May 13, 2026 · May 19, 2026 · May 20, 2026
commit b57cd61907ca059383cb7a09dd3fdd8be803cc27
@@ -103,6 +103,54 @@ func getCloseStateReason(stateReason string) IssueClosedStateReason {
 	}
 }
 
+// IssueFieldRef resolves the name of an issue field across its concrete types.
+// IssueFields is a union of IssueFieldDate, IssueFieldNumber, IssueFieldSingleSelect, IssueFieldText,
+// so we have to ask for `name` on each member.
+type IssueFieldRef struct {
+	Date         struct{ Name githubv4.String } `graphql:"... on IssueFieldDate"`
+	Number       struct{ Name githubv4.String } `graphql:"... on IssueFieldNumber"`
+	SingleSelect struct{ Name githubv4.String } `graphql:"... on IssueFieldSingleSelect"`
+	Text         struct{ Name githubv4.String } `graphql:"... on IssueFieldText"`
+}
+
+// Name returns the populated name from whichever IssueFields union variant the field resolved to.
+func (r IssueFieldRef) Name() string {
+	switch {
+	case r.Date.Name != "":
+		return string(r.Date.Name)
+	case r.Number.Name != "":
+		return string(r.Number.Name)
+	case r.SingleSelect.Name != "":
+		return string(r.SingleSelect.Name)
+	case r.Text.Name != "":
+		return string(r.Text.Name)
+	}
+	return ""
+}
+
+// IssueFieldValueFragment captures the value of a custom issue field. IssueFieldValue is a union
+// of 4 concrete value types; each carries its own value scalar and a reference to its parent field.
+// The Number variant's `value` is aliased to `valueNumber` to avoid a Float vs String type clash on decode.
+type IssueFieldValueFragment struct {
+	TypeName  string `graphql:"__typename"`
+	DateValue struct {
+		Field IssueFieldRef
+		Value githubv4.String
+	} `graphql:"... on IssueFieldDateValue"`
+	NumberValue struct {
+		Field IssueFieldRef
+		Value githubv4.Float `graphql:"valueNumber: value"`
+	} `graphql:"... on IssueFieldNumberValue"`
+	SingleSelectValue struct {
+		Field IssueFieldRef
+		Value githubv4.String
+	} `graphql:"... on IssueFieldSingleSelectValue"`
+	TextValue struct {
+		Field IssueFieldRef
+		Value githubv4.String
+	} `graphql:"... on IssueFieldTextValue"`
+}
+
 // IssueFragment represents a fragment of an issue node in the GraphQL API.
 type IssueFragment struct {
 	Number     githubv4.Int
@@ -126,6 +174,9 @@ type IssueFragment struct {
 	Comments struct {
 		TotalCount githubv4.Int
 	} `graphql:"comments"`
+	IssueFieldValues struct {
+		Nodes []IssueFieldValueFragment
+	} `graphql:"issueFieldValues(first: 25)"`
 }
 
 // Common interface for all issue query types

@@ -1063,6 +1063,15 @@ func Test_ListIssues(t *testing.T) {
 			"comments": map[string]any{
 				"totalCount": 5,
 			},
+			"issueFieldValues": map[string]any{
+				"nodes": []map[string]any{
+					{
+						"__typename": "IssueFieldSingleSelectValue",
+						"field":      map[string]any{"name": "priority"},
+						"value":      "P1",
+					},
+				},
+			},
 		},
 		{
 			"number":     456,
@@ -1081,6 +1090,9 @@ func Test_ListIssues(t *testing.T) {
 			"comments": map[string]any{
 				"totalCount": 3,
 			},
+			"issueFieldValues": map[string]any{
+				"nodes": []map[string]any{},
+			},
 		},
 	}
 
@@ -1101,6 +1113,9 @@ func Test_ListIssues(t *testing.T) {
 			"comments": map[string]any{
 				"totalCount": 1,
 			},
+			"issueFieldValues": map[string]any{
+				"nodes": []map[string]any{},
+			},
 		},
 	}
 
@@ -1275,8 +1290,9 @@ func Test_ListIssues(t *testing.T) {
 	}
 
 	// Define the actual query strings that match the implementation
-	qBasicNoLabels := "query($after:String$direction:OrderDirection!$first:Int!$orderBy:IssueOrderField!$owner:String!$repo:String!$states:[IssueState!]!){repository(owner: $owner, name: $repo){issues(first: $first, after: $after, states: $states, orderBy: {field: $orderBy, direction: $direction}){nodes{number,title,body,state,databaseId,author{login},createdAt,updatedAt,labels(first: 100){nodes{name,id,description}},comments{totalCount}},pageInfo{hasNextPage,hasPreviousPage,startCursor,endCursor},totalCount},isPrivate}}"
-	qWithLabels := "query($after:String$direction:OrderDirection!$first:Int!$labels:[String!]!$orderBy:IssueOrderField!$owner:String!$repo:String!$states:[IssueState!]!){repository(owner: $owner, name: $repo){issues(first: $first, after: $after, labels: $labels, states: $states, orderBy: {field: $orderBy, direction: $direction}){nodes{number,title,body,state,databaseId,author{login},createdAt,updatedAt,labels(first: 100){nodes{name,id,description}},comments{totalCount}},pageInfo{hasNextPage,hasPreviousPage,startCursor,endCursor},totalCount},isPrivate}}"
+	issueFieldValuesSelection := "issueFieldValues(first: 25){nodes{__typename,... on IssueFieldDateValue{field{... on IssueFieldDate{name},... on IssueFieldNumber{name},... on IssueFieldSingleSelect{name},... on IssueFieldText{name}},value},... on IssueFieldNumberValue{field{... on IssueFieldDate{name},... on IssueFieldNumber{name},... on IssueFieldSingleSelect{name},... on IssueFieldText{name}},valueNumber: value},... on IssueFieldSingleSelectValue{field{... on IssueFieldDate{name},... on IssueFieldNumber{name},... on IssueFieldSingleSelect{name},... on IssueFieldText{name}},value},... on IssueFieldTextValue{field{... on IssueFieldDate{name},... on IssueFieldNumber{name},... on IssueFieldSingleSelect{name},... on IssueFieldText{name}},value}}}"
+	qBasicNoLabels := "query($after:String$direction:OrderDirection!$first:Int!$orderBy:IssueOrderField!$owner:String!$repo:String!$states:[IssueState!]!){repository(owner: $owner, name: $repo){issues(first: $first, after: $after, states: $states, orderBy: {field: $orderBy, direction: $direction}){nodes{number,title,body,state,databaseId,author{login},createdAt,updatedAt,labels(first: 100){nodes{name,id,description}},comments{totalCount}," + issueFieldValuesSelection + "},pageInfo{hasNextPage,hasPreviousPage,startCursor,endCursor},totalCount},isPrivate}}"
+	qWithLabels := "query($after:String$direction:OrderDirection!$first:Int!$labels:[String!]!$orderBy:IssueOrderField!$owner:String!$repo:String!$states:[IssueState!]!){repository(owner: $owner, name: $repo){issues(first: $first, after: $after, labels: $labels, states: $states, orderBy: {field: $orderBy, direction: $direction}){nodes{number,title,body,state,databaseId,author{login},createdAt,updatedAt,labels(first: 100){nodes{name,id,description}},comments{totalCount}," + issueFieldValuesSelection + "},pageInfo{hasNextPage,hasPreviousPage,startCursor,endCursor},totalCount},isPrivate}}"
 
 	for _, tc := range tests {
 		t.Run(tc.name, func(t *testing.T) {
@@ -1347,6 +1363,14 @@ func Test_ListIssues(t *testing.T) {
 				for _, label := range issue.Labels {
 					assert.NotEmpty(t, label, "Label should be a non-empty string")
 				}
+
+				// Field values should be flattened to {field, value} pairs. Issue #123 in the mock
+				// data has a SingleSelectValue for "priority"; all others have an empty list.
+				if issue.Number == 123 {
+					assert.Equal(t, []MinimalIssueFieldValue{{Field: "priority", Value: "P1"}}, issue.FieldValues)
+				} else {
+					assert.Empty(t, issue.FieldValues)
+				}
 			}
 		})
 	}
@@ -1392,7 +1416,7 @@ func Test_ListIssues_IFC_InsidersMode(t *testing.T) {
 		})
 	}
 
-	query := "query($after:String$direction:OrderDirection!$first:Int!$orderBy:IssueOrderField!$owner:String!$repo:String!$states:[IssueState!]!){repository(owner: $owner, name: $repo){issues(first: $first, after: $after, states: $states, orderBy: {field: $orderBy, direction: $direction}){nodes{number,title,body,state,databaseId,author{login},createdAt,updatedAt,labels(first: 100){nodes{name,id,description}},comments{totalCount}},pageInfo{hasNextPage,hasPreviousPage,startCursor,endCursor},totalCount},isPrivate}}"
+	query := "query($after:String$direction:OrderDirection!$first:Int!$orderBy:IssueOrderField!$owner:String!$repo:String!$states:[IssueState!]!){repository(owner: $owner, name: $repo){issues(first: $first, after: $after, states: $states, orderBy: {field: $orderBy, direction: $direction}){nodes{number,title,body,state,databaseId,author{login},createdAt,updatedAt,labels(first: 100){nodes{name,id,description}},comments{totalCount},issueFieldValues(first: 25){nodes{__typename,... on IssueFieldDateValue{field{... on IssueFieldDate{name},... on IssueFieldNumber{name},... on IssueFieldSingleSelect{name},... on IssueFieldText{name}},value},... on IssueFieldNumberValue{field{... on IssueFieldDate{name},... on IssueFieldNumber{name},... on IssueFieldSingleSelect{name},... on IssueFieldText{name}},valueNumber: value},... on IssueFieldSingleSelectValue{field{... on IssueFieldDate{name},... on IssueFieldNumber{name},... on IssueFieldSingleSelect{name},... on IssueFieldText{name}},value},... on IssueFieldTextValue{field{... on IssueFieldDate{name},... on IssueFieldNumber{name},... on IssueFieldSingleSelect{name},... on IssueFieldText{name}},value}}}},pageInfo{hasNextPage,hasPreviousPage,startCursor,endCursor},totalCount},isPrivate}}"
 
 	vars := map[string]any{
 		"owner":     "octocat",

@@ -1,6 +1,7 @@
 package github
 
 import (
+	"strconv"
 	"time"
 
 	"github.com/google/go-github/v82/github"
@@ -171,26 +172,35 @@ type MinimalReactions struct {
 
 // MinimalIssue is the trimmed output type for issue objects to reduce verbosity.
 type MinimalIssue struct {
-	Number            int               `json:"number"`
-	Title             string            `json:"title"`
-	Body              string            `json:"body,omitempty"`
-	State             string            `json:"state"`
-	StateReason       string            `json:"state_reason,omitempty"`
-	Draft             bool              `json:"draft,omitempty"`
-	Locked            bool              `json:"locked,omitempty"`
-	HTMLURL           string            `json:"html_url,omitempty"`
-	User              *MinimalUser      `json:"user,omitempty"`
-	AuthorAssociation string            `json:"author_association,omitempty"`
-	Labels            []string          `json:"labels,omitempty"`
-	Assignees         []string          `json:"assignees,omitempty"`
-	Milestone         string            `json:"milestone,omitempty"`
-	Comments          int               `json:"comments,omitempty"`
-	Reactions         *MinimalReactions `json:"reactions,omitempty"`
-	CreatedAt         string            `json:"created_at,omitempty"`
-	UpdatedAt         string            `json:"updated_at,omitempty"`
-	ClosedAt          string            `json:"closed_at,omitempty"`
-	ClosedBy          string            `json:"closed_by,omitempty"`
-	IssueType         string            `json:"issue_type,omitempty"`
+	Number            int                      `json:"number"`
+	Title             string                   `json:"title"`
+	Body              string                   `json:"body,omitempty"`
+	State             string                   `json:"state"`
+	StateReason       string                   `json:"state_reason,omitempty"`
+	Draft             bool                     `json:"draft,omitempty"`
+	Locked            bool                     `json:"locked,omitempty"`
+	HTMLURL           string                   `json:"html_url,omitempty"`
+	User              *MinimalUser             `json:"user,omitempty"`
+	AuthorAssociation string                   `json:"author_association,omitempty"`
+	Labels            []string                 `json:"labels,omitempty"`
+	Assignees         []string                 `json:"assignees,omitempty"`
+	Milestone         string                   `json:"milestone,omitempty"`
+	Comments          int                      `json:"comments,omitempty"`
+	Reactions         *MinimalReactions        `json:"reactions,omitempty"`
+	CreatedAt         string                   `json:"created_at,omitempty"`
+	UpdatedAt         string                   `json:"updated_at,omitempty"`
+	ClosedAt          string                   `json:"closed_at,omitempty"`
+	ClosedBy          string                   `json:"closed_by,omitempty"`
+	IssueType         string                   `json:"issue_type,omitempty"`
+	FieldValues       []MinimalIssueFieldValue `json:"field_values,omitempty"`
+}
+
+// MinimalIssueFieldValue is the trimmed output type for a custom issue field value.
+// Single-value variants (date, number, single-select, text) populate Value. Values is reserved for multi-select.
+type MinimalIssueFieldValue struct {
+	Field  string   `json:"field"`
+	Value  string   `json:"value,omitempty"`
+	Values []string `json:"values,omitempty"`
 }
 
 // MinimalIssuesResponse is the trimmed output for a paginated list of issues.
@@ -403,9 +413,43 @@ func fragmentToMinimalIssue(fragment IssueFragment) MinimalIssue {
 		m.Labels = append(m.Labels, string(label.Name))
 	}
 
+	for _, fv := range fragment.IssueFieldValues.Nodes {
+		if mfv, ok := fragmentToMinimalIssueFieldValue(fv); ok {
+			m.FieldValues = append(m.FieldValues, mfv)
+		}
+	}
+
 	return m
 }
 
+// fragmentToMinimalIssueFieldValue flattens the union value fragment into a single
+// {field, value} pair. Returns ok=false if the typename is unrecognised.
+func fragmentToMinimalIssueFieldValue(fv IssueFieldValueFragment) (MinimalIssueFieldValue, bool) {
+	switch fv.TypeName {
+	case "IssueFieldDateValue":
+		return MinimalIssueFieldValue{
+			Field: fv.DateValue.Field.Name(),
+			Value: string(fv.DateValue.Value),
+		}, true
+	case "IssueFieldNumberValue":
+		return MinimalIssueFieldValue{
+			Field: fv.NumberValue.Field.Name(),
+			Value: strconv.FormatFloat(float64(fv.NumberValue.Value), 'f', -1, 64),
+		}, true
+	case "IssueFieldSingleSelectValue":
+		return MinimalIssueFieldValue{
+			Field: fv.SingleSelectValue.Field.Name(),
+			Value: string(fv.SingleSelectValue.Value),
+		}, true
+	case "IssueFieldTextValue":
+		return MinimalIssueFieldValue{
+			Field: fv.TextValue.Field.Name(),
+			Value: string(fv.TextValue.Value),
+		}, true
+	}
+	return MinimalIssueFieldValue{}, false
+}
+
 func convertToMinimalIssuesResponse(fragment IssueQueryFragment) MinimalIssuesResponse {
 	minimalIssues := make([]MinimalIssue, 0, len(fragment.Nodes))
 	for _, issue := range fragment.Nodes {