Merge branch 'iunia/reapply-issue-field-commits' of https://github.com/iulia-b/github-mcp-server into iunia/reapply-issue-field-commits

Author: iulia-b

README.md

@@ -855,6 +855,7 @@ The following sets of tools are available:
   - `assignees`: Usernames to assign to this issue (string[], optional)
   - `body`: Issue body content (string, optional)
   - `duplicate_of`: Issue number that this issue is a duplicate of. Only used when state_reason is 'duplicate'. (number, optional)
+  - `issue_fields`: Issue field values to set. Each item requires field_name and either value or field_option_name. field_option_name is for single-select fields and is resolved to the corresponding option ID automatically. (object[], optional)
   - `issue_number`: Issue number to update (number, optional)
   - `labels`: Labels to apply to this issue (string[], optional)
   - `method`: Write operation to perform on a single issue.

pkg/github/__toolsnaps__/issue_write.snap

@@ -30,22 +30,23 @@
         "type": "number"
       },
       "issue_fields": {
-        "description": "Custom issue field values to set. Each entry specifies a field by name and its value. For single-select fields, value must be the option name (e.g. \"P1\"). For date fields, value must be YYYY-MM-DD.",
+        "description": "Issue field values to set. Each item requires field_name and either value or field_option_name. field_option_name is for single-select fields and is resolved to the corresponding option ID automatically.",
         "items": {
-          "additionalProperties": false,
           "properties": {
             "field_name": {
-              "description": "Name of the custom field (case-insensitive).",
+              "description": "Issue field name",
               "type": "string"
             },
-            "value": {
-              "description": "Value to set. For single-select, the option name. For dates, YYYY-MM-DD. For numbers, the numeric value as a string.",
+            "field_option_name": {
+              "description": "Single-select option name to resolve and set for the field",
               "type": "string"
+            },
+            "value": {
+              "description": "Value for text/number/date/single-select fields. For single-select, you can use field_option_name instead."
             }
           },
           "required": [
-            "field_name",
-            "value"
+            "field_name"
           ],
           "type": "object"
         },

pkg/github/issues.go

@@ -37,6 +37,36 @@ type CloseIssueInput struct {
 // Used to extend the functionality of the githubv4 library to support closing issues as duplicates.
 type IssueClosedStateReason string
 
+// IssueWriteFieldInput is a user-friendly issue field input for issue_write.
+// Field IDs and option IDs are resolved internally before calling the REST API.
+type IssueWriteFieldInput struct {
+	FieldName       string
+	Value           any
+	FieldOptionName string
+}
+
+type issueFieldMetadataOption struct {
+	DatabaseID githubv4.Int `graphql:"databaseId"`
+	Name       githubv4.String
+}
+
+type issueFieldMetadataNode struct {
+	DatabaseID        githubv4.Int `graphql:"databaseId"`
+	Name              githubv4.String
+	DataType          githubv4.String
+	SingleSelectField struct {
+		Options []issueFieldMetadataOption `graphql:"options"`
+	} `graphql:"... on IssueFieldSingleSelect"`
+}
+
+type issueFieldMetadataQuery struct {
+	Repository struct {
+		IssueFields struct {
+			Nodes []issueFieldMetadataNode
+		} `graphql:"issueFields(first: 100)"`
+	} `graphql:"repository(owner: $owner, name: $repo)"`
+}
+
 const (
 	IssueClosedStateReasonCompleted  IssueClosedStateReason = "COMPLETED"
 	IssueClosedStateReasonDuplicate  IssueClosedStateReason = "DUPLICATE"
@@ -299,6 +329,127 @@ type IssueFieldValueFragment struct {
 	} `graphql:"... on IssueFieldTextValue"`
 }
 
+func optionalIssueWriteFields(args map[string]any) ([]IssueWriteFieldInput, error) {
+	issueFieldsRaw, exists := args["issue_fields"]
+	if !exists {
+		return nil, nil
+	}
+
+	var inputMaps []map[string]any
+	switch v := issueFieldsRaw.(type) {
+	case []any:
+		for _, item := range v {
+			itemMap, ok := item.(map[string]any)
+			if !ok {
+				return nil, fmt.Errorf("each issue_fields item must be an object")
+			}
+			inputMaps = append(inputMaps, itemMap)
+		}
+	case []map[string]any:
+		inputMaps = v
+	default:
+		return nil, fmt.Errorf("issue_fields must be an array")
+	}
+
+	issueFields := make([]IssueWriteFieldInput, 0, len(inputMaps))
+	for _, itemMap := range inputMaps {
+		fieldName, err := RequiredParam[string](itemMap, "field_name")
+		if err != nil || strings.TrimSpace(fieldName) == "" {
+			return nil, fmt.Errorf("field_name is required for each issue_fields item")
+		}
+
+		fieldOptionName, err := OptionalParam[string](itemMap, "field_option_name")
+		if err != nil {
+			return nil, err
+		}
+
+		value, hasValue := itemMap["value"]
+		if hasValue && value == nil {
+			return nil, fmt.Errorf("value cannot be null for field %q", fieldName)
+		}
+
+		if hasValue && fieldOptionName != "" {
+			return nil, fmt.Errorf("issue field %q cannot specify both value and field_option_name", fieldName)
+		}
+
+		if !hasValue && fieldOptionName == "" {
+			return nil, fmt.Errorf("issue field %q must specify either value or field_option_name", fieldName)
+		}
+
+		issueFields = append(issueFields, IssueWriteFieldInput{
+			FieldName:       fieldName,
+			Value:           value,
+			FieldOptionName: fieldOptionName,
+		})
+	}
+
+	return issueFields, nil
+}
+
+func resolveIssueRequestFieldValues(ctx context.Context, gqlClient *githubv4.Client, owner, repo string, issueFields []IssueWriteFieldInput) ([]*github.IssueRequestFieldValue, error) {
+	if len(issueFields) == 0 {
+		return nil, nil
+	}
+
+	query := issueFieldMetadataQuery{}
+	vars := map[string]any{
+		"owner": githubv4.String(owner),
+		"repo":  githubv4.String(repo),
+	}
+	if err := gqlClient.Query(ctx, &query, vars); err != nil {
+		return nil, fmt.Errorf("failed to query issue fields metadata: %w", err)
+	}
+
+	fieldByName := make(map[string]issueFieldMetadataNode, len(query.Repository.IssueFields.Nodes))
+	for _, field := range query.Repository.IssueFields.Nodes {
+		fieldByName[strings.ToLower(strings.TrimSpace(string(field.Name)))] = field
+	}
+
+	resolved := make([]*github.IssueRequestFieldValue, 0, len(issueFields))
+	for _, fieldInput := range issueFields {
+		field, ok := fieldByName[strings.ToLower(strings.TrimSpace(fieldInput.FieldName))]
+		if !ok {
+			return nil, fmt.Errorf("issue field %q was not found in %s/%s", fieldInput.FieldName, owner, repo)
+		}
+
+		fieldID := int64(field.DatabaseID)
+		if fieldID == 0 {
+			return nil, fmt.Errorf("issue field %q is missing databaseId", fieldInput.FieldName)
+		}
+
+		resolvedValue := fieldInput.Value
+		if fieldInput.FieldOptionName != "" {
+			if !strings.EqualFold(string(field.DataType), "single_select") {
+				return nil, fmt.Errorf("issue field %q is %q, so field_option_name cannot be used", fieldInput.FieldName, field.DataType)
+			}
+
+			optionFound := false
+			for _, option := range field.SingleSelectField.Options {
+				if strings.EqualFold(strings.TrimSpace(string(option.Name)), strings.TrimSpace(fieldInput.FieldOptionName)) {
+					optionID := int64(option.DatabaseID)
+					if optionID == 0 {
+						return nil, fmt.Errorf("issue field option %q on field %q is missing databaseId", fieldInput.FieldOptionName, fieldInput.FieldName)
+					}
+					resolvedValue = optionID
+					optionFound = true
+					break
+				}
+			}
+
+			if !optionFound {
+				return nil, fmt.Errorf("issue field option %q was not found for field %q", fieldInput.FieldOptionName, fieldInput.FieldName)
+			}
+		}
+
+		resolved = append(resolved, &github.IssueRequestFieldValue{
+			FieldID: fieldID,
+			Value:   resolvedValue,
+		})
+	}
+
+	return resolved, nil
+}
+
 // IssueFragment represents a fragment of an issue node in the GraphQL API.
 type IssueFragment struct {
 	Number     githubv4.Int
@@ -1412,7 +1563,7 @@ func parseRepositoryURL(repoURL string) (string, string, bool) {
 // SearchIssueResult wraps a REST search hit with its custom issue field values, fetched in a follow-up GraphQL nodes() query.
 type SearchIssueResult struct {
 	*github.Issue
-	FieldValues []MinimalIssueFieldValue `json:"field_values,omitempty"`
+	FieldValues []MinimalFieldValue `json:"field_values,omitempty"`
 }
 
 // MarshalJSON serializes SearchIssueResult, suppressing the raw issue_field_values from the
@@ -1461,7 +1612,7 @@ type searchIssuesNodesQuery struct {
 // fetchIssueFieldValuesByNodeID runs one GraphQL nodes() query for the given REST issues and
 // returns a map of node_id -> flattened field values. Issues without a node_id are skipped, and
 // an empty result set short-circuits the round-trip.
-func fetchIssueFieldValuesByNodeID(ctx context.Context, gqlClient *githubv4.Client, issues []*github.Issue) (map[string][]MinimalIssueFieldValue, error) {
+func fetchIssueFieldValuesByNodeID(ctx context.Context, gqlClient *githubv4.Client, issues []*github.Issue) (map[string][]MinimalFieldValue, error) {
 	ids := make([]githubv4.ID, 0, len(issues))
 	for _, iss := range issues {
 		if iss == nil || iss.NodeID == nil || *iss.NodeID == "" {
@@ -1478,15 +1629,15 @@ func fetchIssueFieldValuesByNodeID(ctx context.Context, gqlClient *githubv4.Clie
 		return nil, err
 	}
 
-	result := make(map[string][]MinimalIssueFieldValue, len(q.Nodes))
+	result := make(map[string][]MinimalFieldValue, len(q.Nodes))
 	for _, n := range q.Nodes {
 		idStr, ok := n.Issue.ID.(string)
 		if !ok || idStr == "" {
 			continue
 		}
-		vals := make([]MinimalIssueFieldValue, 0, len(n.Issue.IssueFieldValues.Nodes))
+		vals := make([]MinimalFieldValue, 0, len(n.Issue.IssueFieldValues.Nodes))
 		for _, fv := range n.Issue.IssueFieldValues.Nodes {
-			if m, ok := fragmentToMinimalIssueFieldValue(fv); ok {
+			if m, ok := fragmentToMinimalFieldValue(fv); ok {
 				vals = append(vals, m)
 			}
 		}
@@ -1524,8 +1675,8 @@ func searchIssuesHandler(ctx context.Context, deps ToolDependencies, args map[st
 		return ghErrors.NewGitHubAPIStatusErrorResponse(ctx, errorPrefix, resp, body), nil
 	}
 
-	var fieldValuesByID map[string][]MinimalIssueFieldValue
-	if deps.IsFeatureEnabled(ctx, FeatureFlagIssueFields) && len(result.Issues) > 0 {
+	var fieldValuesByID map[string][]MinimalFieldValue
+	if len(result.Issues) > 0 {
 		gqlClient, err := deps.GetGQLClient(ctx)
 		if err != nil {
 			return utils.NewToolResultErrorFromErr(errorPrefix+": failed to get GitHub GraphQL client", err), nil
@@ -1657,21 +1808,23 @@ Options are:
 					},
 					"issue_fields": {
 						Type:        "array",
-						Description: "Custom issue field values to set. Each entry specifies a field by name and its value. For single-select fields, value must be the option name (e.g. \"P1\"). For date fields, value must be YYYY-MM-DD.",
+						Description: "Issue field values to set. Each item requires field_name and either value or field_option_name. field_option_name is for single-select fields and is resolved to the corresponding option ID automatically.",
 						Items: &jsonschema.Schema{
-							Type:                 "object",
-							AdditionalProperties: &jsonschema.Schema{Not: &jsonschema.Schema{}},
+							Type: "object",
 							Properties: map[string]*jsonschema.Schema{
 								"field_name": {
 									Type:        "string",
-									Description: "Name of the custom field (case-insensitive).",
+									Description: "Issue field name",
 								},
 								"value": {
+									Description: "Value for text/number/date/single-select fields. For single-select, you can use field_option_name instead.",
+								},
+								"field_option_name": {
 									Type:        "string",
-									Description: "Value to set. For single-select, the option name. For dates, YYYY-MM-DD. For numbers, the numeric value as a string.",
+									Description: "Single-select option name to resolve and set for the field",
 								},
 							},
-							Required: []string{"field_name", "value"},
+							Required: []string{"field_name"},
 						},
 					},
 				},
@@ -1775,7 +1928,7 @@ Options are:
 				return utils.NewToolResultError("duplicate_of can only be used when state_reason is 'duplicate'"), nil, nil
 			}
 
-			issueFieldInputs, err := optionalIssueWriteFields(args)
+			issueFields, err := optionalIssueWriteFields(args)
 			if err != nil {
 				return utils.NewToolResultError(err.Error()), nil, nil
 			}
@@ -1790,7 +1943,7 @@ Options are:
 				return utils.NewToolResultErrorFromErr("failed to get GraphQL client", err), nil, nil
 			}
 
-			issueFieldValues, err := resolveIssueWriteFieldValues(ctx, gqlClient, owner, repo, issueFieldInputs)
+			issueFieldValues, err := resolveIssueRequestFieldValues(ctx, gqlClient, owner, repo, issueFields)
 			if err != nil {
 				return utils.NewToolResultError(fmt.Sprintf("failed to resolve issue_fields: %v", err)), nil, nil
 			}