Merge branch 'main' into feat/git-blame-tool

Author: MayorFaj

pkg/github/__toolsnaps__/get_me.snap

@@ -5,7 +5,8 @@
   },
   "description": "Get details of the authenticated GitHub user. Use this when a request is about the user's own profile for GitHub. Or when information is missing to build other tool calls.",
   "inputSchema": {
-    "type": "object"
+    "type": "object",
+    "properties": {}
   },
   "name": "get_me"
 }

pkg/github/context_tools.go

@@ -2,6 +2,7 @@ package github
 
 import (
 	"context"
+	"encoding/json"
 	"time"
 
 	ghErrors "github.com/github/github-mcp-server/pkg/errors"
@@ -43,9 +44,9 @@ func GetMe(getClient GetClientFn, t translations.TranslationHelperFunc) (mcp.Too
 				Title:        t("TOOL_GET_ME_USER_TITLE", "Get my user profile"),
 				ReadOnlyHint: true,
 			},
-			InputSchema: &jsonschema.Schema{
-				Type: "object",
-			},
+			// Use json.RawMessage to ensure "properties" is included even when empty.
+			// OpenAI strict mode requires the properties field to be present.
+			InputSchema: json.RawMessage(`{"type":"object","properties":{}}`),
 		},
 		mcp.ToolHandlerFor[map[string]any, any](func(ctx context.Context, _ *mcp.CallToolRequest, _ map[string]any) (*mcp.CallToolResult, any, error) {
 			client, err := getClient(ctx)

pkg/github/issues.go

@@ -1381,11 +1381,14 @@ func ListIssues(getGQLClient GetGQLClientFn, t translations.TranslationHelperFun
 				return utils.NewToolResultError(err.Error()), nil, nil
 			}
 
-			// If the state has a value, cast into an array of strings
+			// Normalize and filter by state
+			state = strings.ToUpper(state)
 			var states []githubv4.IssueState
-			if state != "" {
-				states = append(states, githubv4.IssueState(state))
-			} else {
+
+			switch state {
+			case "OPEN", "CLOSED":
+				states = []githubv4.IssueState{githubv4.IssueState(state)}
+			default:
 				states = []githubv4.IssueState{githubv4.IssueStateOpen, githubv4.IssueStateClosed}
 			}
 
@@ -1405,13 +1408,21 @@ func ListIssues(getGQLClient GetGQLClientFn, t translations.TranslationHelperFun
 				return utils.NewToolResultError(err.Error()), nil, nil
 			}
 
-			// These variables are required for the GraphQL query to be set by default
-			// If orderBy is empty, default to CREATED_AT
-			if orderBy == "" {
+			// Normalize and validate orderBy
+			orderBy = strings.ToUpper(orderBy)
+			switch orderBy {
+			case "CREATED_AT", "UPDATED_AT", "COMMENTS":
+				// Valid, keep as is
+			default:
 				orderBy = "CREATED_AT"
 			}
-			// If direction is empty, default to DESC
-			if direction == "" {
+
+			// Normalize and validate direction
+			direction = strings.ToUpper(direction)
+			switch direction {
+			case "ASC", "DESC":
+				// Valid, keep as is
+			default:
 				direction = "DESC"
 			}
 

pkg/github/issues_test.go

@@ -1183,6 +1183,16 @@ func Test_ListIssues(t *testing.T) {
 			expectError:   false,
 			expectedCount: 2,
 		},
+		{
+			name: "filter by open state - lc",
+			reqParams: map[string]interface{}{
+				"owner": "owner",
+				"repo":  "repo",
+				"state": "open",
+			},
+			expectError:   false,
+			expectedCount: 2,
+		},
 		{
 			name: "filter by closed state",
 			reqParams: map[string]interface{}{
@@ -1229,6 +1239,9 @@ func Test_ListIssues(t *testing.T) {
 			case "filter by open state":
 				matcher := githubv4mock.NewQueryMatcher(qBasicNoLabels, varsOpenOnly, mockResponseOpenOnly)
 				httpClient = githubv4mock.NewMockedHTTPClient(matcher)
+			case "filter by open state - lc":
+				matcher := githubv4mock.NewQueryMatcher(qBasicNoLabels, varsOpenOnly, mockResponseOpenOnly)
+				httpClient = githubv4mock.NewMockedHTTPClient(matcher)
 			case "filter by closed state":
 				matcher := githubv4mock.NewQueryMatcher(qBasicNoLabels, varsClosedOnly, mockResponseClosedOnly)
 				httpClient = githubv4mock.NewMockedHTTPClient(matcher)

pkg/github/repositories.go

@@ -403,6 +403,8 @@ func CreateOrUpdateFile(getClient GetClientFn, t translations.TranslationHelperF
 		if err != nil {
 			return nil, nil, fmt.Errorf("failed to get GitHub client: %w", err)
 		}
+
+		path = strings.TrimPrefix(path, "/")
 		fileContent, resp, err := client.Repositories.CreateFile(ctx, owner, repo, path, opts)
 		if err != nil {
 			return ghErrors.NewGitHubAPIErrorResponse(ctx,