add more evals for copilot cli tools

Author: tommaso-moro

README.md

@@ -980,6 +980,7 @@ The following sets of tools are available:
 - **search_orgs** - Search organizations
   - **Required OAuth Scopes**: `read:org`
   - **Accepted OAuth Scopes**: `admin:org`, `read:org`, `write:org`
+  - `fields`: Subset of fields to return for each organization. If omitted, all fields are returned. Use this to reduce response size when you only need specific fields, e.g. just 'login'. (string[], optional)
   - `order`: Sort order (string, optional)
   - `page`: Page number for pagination (min 1) (number, optional)
   - `perPage`: Results per page for pagination (min 1, max 100) (number, optional)
@@ -1212,6 +1213,7 @@ The following sets of tools are available:
 
 - **get_file_contents** - Get file or directory contents
   - **Required OAuth Scopes**: `repo`
+  - `fields`: Subset of fields to return for each entry when the path is a directory. If omitted, all fields are returned. Ignored when the path is a single file. Use this to reduce response size when listing directories and you only need specific fields, e.g. just 'name' and 'type'. (string[], optional)
   - `owner`: Repository owner (username or organization) (string, required)
   - `path`: Path to file/directory (string, optional)
   - `ref`: Accepts optional git refs such as `refs/tags/{tag}`, `refs/heads/{branch}` or `refs/pull/{pr_number}/head` (string, optional)
@@ -1282,6 +1284,7 @@ The following sets of tools are available:
 
 - **search_code** - Search code
   - **Required OAuth Scopes**: `repo`
+  - `fields`: Subset of fields to return for each code search result. If omitted, all fields are returned. Use this to reduce response size when you only need specific fields; omitting 'repository' in particular drops the largest per-result object. (string[], optional)
   - `order`: Sort order for results (string, optional)
   - `page`: Page number for pagination (min 1) (number, optional)
   - `perPage`: Results per page for pagination (min 1, max 100) (number, optional)
@@ -1394,6 +1397,7 @@ The following sets of tools are available:
 
 - **search_users** - Search users
   - **Required OAuth Scopes**: `repo`
+  - `fields`: Subset of fields to return for each user. If omitted, all fields are returned. Use this to reduce response size when you only need specific fields, e.g. just 'login'. (string[], optional)
   - `order`: Sort order (string, optional)
   - `page`: Page number for pagination (min 1) (number, optional)
   - `perPage`: Results per page for pagination (min 1, max 100) (number, optional)

evals/schema_fields_eval.py

@@ -0,0 +1,20 @@
+# Focused task set for the Copilot CLI-kept tools that just gained a `fields`
+# param: search_code, get_file_contents (repos toolset) and search_users (users).
+# Run with: --toolsets repos,users --tasks-file tasks_cli_tools.txt
+# Format: tag<TAB>task text. {repo}/{org} are substituted from --repo/--org.
+# Tags (per-type breakdown only, never sent to the model):
+#   narrow  -> faithful answer needs a field or two (filtering should help)
+#   full    -> faithful answer needs rich fields/bodies (filtering shouldn't help)
+#   neutral -> ambiguous; the model decides
+
+# --- search_code ---
+narrow	Search {repo} for where the symbol 'NewCommand' is defined and list just the file paths.
+full	Search the code in {repo} for 'http.Client' usages and explain how the HTTP client is configured.
+
+# --- get_file_contents ---
+narrow	List the names of the files and subdirectories in the top-level directory of {repo}.
+full	Read the README in {repo} and summarize what the project does.
+
+# --- search_users ---
+narrow	Search GitHub for users named 'octocat' and give me just their usernames.
+neutral	Find users who contribute to {org} and tell me what you can about them.

evals/tasks_cli_tools.txt

@@ -6,6 +6,24 @@
   "description": "Get the contents of a file or directory from a GitHub repository",
   "inputSchema": {
     "properties": {
+      "fields": {
+        "description": "Subset of fields to return for each entry when the path is a directory. If omitted, all fields are returned. Ignored when the path is a single file. Use this to reduce response size when listing directories and you only need specific fields, e.g. just 'name' and 'type'.",
+        "items": {
+          "enum": [
+            "type",
+            "name",
+            "path",
+            "size",
+            "sha",
+            "url",
+            "git_url",
+            "html_url",
+            "download_url"
+          ],
+          "type": "string"
+        },
+        "type": "array"
+      },
       "owner": {
         "description": "Repository owner (username or organization)",
         "type": "string"

pkg/github/__toolsnaps__/get_file_contents.snap

@@ -6,6 +6,20 @@
   "description": "Fast and precise code search across ALL GitHub repositories using GitHub's native search engine. Best for finding exact symbols, functions, classes, or specific code patterns.",
   "inputSchema": {
     "properties": {
+      "fields": {
+        "description": "Subset of fields to return for each code search result. If omitted, all fields are returned. Use this to reduce response size when you only need specific fields; omitting 'repository' in particular drops the largest per-result object.",
+        "items": {
+          "enum": [
+            "name",
+            "path",
+            "sha",
+            "html_url",
+            "repository"
+          ],
+          "type": "string"
+        },
+        "type": "array"
+      },
       "order": {
         "description": "Sort order for results",
         "enum": [

pkg/github/__toolsnaps__/search_code.snap

@@ -6,6 +6,20 @@
   "description": "Find GitHub organizations by name, location, or other organization metadata. Ideal for discovering companies, open source foundations, or teams.",
   "inputSchema": {
     "properties": {
+      "fields": {
+        "description": "Subset of fields to return for each organization. If omitted, all fields are returned. Use this to reduce response size when you only need specific fields, e.g. just 'login'.",
+        "items": {
+          "enum": [
+            "login",
+            "id",
+            "profile_url",
+            "avatar_url",
+            "details"
+          ],
+          "type": "string"
+        },
+        "type": "array"
+      },
       "order": {
         "description": "Sort order",
         "enum": [

pkg/github/__toolsnaps__/search_orgs.snap

@@ -6,6 +6,20 @@
   "description": "Find GitHub users by username, real name, or other profile information. Useful for locating developers, contributors, or team members.",
   "inputSchema": {
     "properties": {
+      "fields": {
+        "description": "Subset of fields to return for each user. If omitted, all fields are returned. Use this to reduce response size when you only need specific fields, e.g. just 'login'.",
+        "items": {
+          "enum": [
+            "login",
+            "id",
+            "profile_url",
+            "avatar_url",
+            "details"
+          ],
+          "type": "string"
+        },
+        "type": "array"
+      },
       "order": {
         "description": "Sort order",
         "enum": [

pkg/github/__toolsnaps__/search_users.snap

@@ -938,6 +938,22 @@ var tagFieldEnum = []any{"name", "sha"}
 // matching the JSON field names of MinimalRelease.
 var releaseFieldEnum = []any{"id", "tag_name", "name", "body", "html_url", "published_at", "prerelease", "draft", "author"}
 
+// codeSearchItemFieldEnum lists the selectable fields for search_code result
+// items, matching the JSON field names of MinimalCodeSearchItem. The nested
+// repository object is the heaviest field, so omitting it is the main lever for
+// shrinking large result sets.
+var codeSearchItemFieldEnum = []any{"name", "path", "sha", "html_url", "repository"}
+
+// userSearchFieldEnum lists the selectable fields for search_users and
+// search_orgs result items, matching the JSON field names of MinimalUser.
+var userSearchFieldEnum = []any{"login", "id", "profile_url", "avatar_url", "details"}
+
+// fileContentFieldEnum lists the selectable fields for get_file_contents
+// directory listings, matching the JSON field names of
+// github.RepositoryContent that appear for directory entries. Only applied when
+// the requested path is a directory; ignored for single files.
+var fileContentFieldEnum = []any{"type", "name", "path", "size", "sha", "url", "git_url", "html_url", "download_url"}
+
 // filterFields marshals v to a JSON object and returns a map containing only the
 // requested fields. Fields that are unknown or absent from the JSON (for example
 // empty values dropped via omitempty) are skipped.

pkg/github/minimal_types.go

@@ -762,6 +762,14 @@ func GetFileContents(t translations.TranslationHelperFunc) inventory.ServerTool
 						Type:        "string",
 						Description: "Accepts optional commit SHA. If specified, it will be used instead of ref",
 					},
+					"fields": {
+						Type:        "array",
+						Description: "Subset of fields to return for each entry when the path is a directory. If omitted, all fields are returned. Ignored when the path is a single file. Use this to reduce response size when listing directories and you only need specific fields, e.g. just 'name' and 'type'.",
+						Items: &jsonschema.Schema{
+							Type: "string",
+							Enum: fileContentFieldEnum,
+						},
+					},
 				},
 				Required: []string{"owner", "repo"},
 			},
@@ -794,6 +802,11 @@ func GetFileContents(t translations.TranslationHelperFunc) inventory.ServerTool
 				return utils.NewToolResultError(err.Error()), nil, nil
 			}
 
+			fields, err := OptionalStringArrayParam(args, "fields")
+			if err != nil {
+				return utils.NewToolResultError(err.Error()), nil, nil
+			}
+
 			client, err := deps.GetClient(ctx)
 			if err != nil {
 				return utils.NewToolResultError("failed to get GitHub client"), nil, nil
@@ -907,7 +920,15 @@ func GetFileContents(t translations.TranslationHelperFunc) inventory.ServerTool
 				return utils.NewToolResultResource(fmt.Sprintf("successfully downloaded binary file (SHA: %s)%s", fileSHA, successNote), result), nil, nil
 			} else if dirContent != nil {
 				// file content or file SHA is nil which means it's a directory
-				r, err := json.Marshal(dirContent)
+				var payload any = dirContent
+				if len(fields) > 0 {
+					filtered, err := filterEachField(dirContent, fields)
+					if err != nil {
+						return utils.NewToolResultErrorFromErr("failed to filter directory contents", err), nil, nil
+					}
+					payload = filtered
+				}
+				r, err := json.Marshal(payload)
 				if err != nil {
 					return utils.NewToolResultError("failed to marshal response"), nil, nil
 				}

pkg/github/repositories.go

@@ -477,6 +477,68 @@ func Test_GetFileContents(t *testing.T) {
 	}
 }
 
+func Test_GetFileContents_DirectoryFieldFiltering(t *testing.T) {
+	mockDirContent := []*github.RepositoryContent{
+		{
+			Type:        github.Ptr("file"),
+			Name:        github.Ptr("README.md"),
+			Path:        github.Ptr("README.md"),
+			SHA:         github.Ptr("abc123"),
+			Size:        github.Ptr(42),
+			HTMLURL:     github.Ptr("https://github.com/owner/repo/blob/main/README.md"),
+			DownloadURL: github.Ptr("https://raw.githubusercontent.com/owner/repo/main/README.md"),
+		},
+		{
+			Type:    github.Ptr("dir"),
+			Name:    github.Ptr("src"),
+			Path:    github.Ptr("src"),
+			SHA:     github.Ptr("def456"),
+			HTMLURL: github.Ptr("https://github.com/owner/repo/tree/main/src"),
+		},
+	}
+
+	serverTool := GetFileContents(translations.NullTranslationHelper)
+	client := github.NewClient(MockHTTPClientWithHandlers(map[string]http.HandlerFunc{
+		GetReposByOwnerByRepo:            mockResponse(t, http.StatusOK, "{\"name\": \"repo\", \"default_branch\": \"main\"}"),
+		GetReposGitRefByOwnerByRepoByRef: mockResponse(t, http.StatusOK, "{\"ref\": \"refs/heads/main\", \"object\": {\"sha\": \"\"}}"),
+		GetReposContentsByOwnerByRepoByPath: expectQueryParams(t, map[string]string{}).andThen(
+			mockResponse(t, http.StatusOK, mockDirContent),
+		),
+		GetRawReposContentsByOwnerByRepoByPath: expectQueryParams(t, map[string]string{"branch": "main"}).andThen(
+			mockResponse(t, http.StatusNotFound, nil),
+		),
+	}))
+	deps := BaseDeps{Client: client}
+	handler := serverTool.Handler(deps)
+
+	request := createMCPRequest(map[string]any{
+		"owner":  "owner",
+		"repo":   "repo",
+		"path":   "src/",
+		"fields": []any{"name", "type"},
+	})
+
+	result, err := handler(ContextWithDeps(context.Background(), deps), &request)
+	require.NoError(t, err)
+	require.False(t, result.IsError)
+
+	textContent := getTextResult(t, result)
+
+	// Each directory entry is reduced to the requested fields only.
+	var returned []map[string]any
+	require.NoError(t, json.Unmarshal([]byte(textContent.Text), &returned))
+	require.Len(t, returned, 2)
+	for _, entry := range returned {
+		require.Len(t, entry, 2)
+		assert.Contains(t, entry, "name")
+		assert.Contains(t, entry, "type")
+	}
+
+	assert.NotContains(t, textContent.Text, "download_url")
+	assert.NotContains(t, textContent.Text, "html_url")
+	assert.NotContains(t, textContent.Text, "sha")
+}
+
 func Test_ForkRepository(t *testing.T) {
 	// Verify tool definition once
 	serverTool := ForkRepository(translations.NullTranslationHelper)