diff --git a/README.md b/README.md
index b291af0e6..9962fb801 100644
--- a/README.md
+++ b/README.md
@@ -874,6 +874,12 @@ The following sets of tools are available:
   - `title`: Issue title (string, optional)
   - `type`: Type of this issue. Only use if the repository has issue types configured. Use list_issue_types tool to get valid type values for the organization. If the repository doesn't support issue types, omit this parameter. (string, optional)
 
+- **list_issue_fields** - List issue fields
+  - **Required OAuth Scopes**: `repo`, `read:org`
+  - **Accepted OAuth Scopes**: `admin:org`, `read:org`, `repo`, `write:org`
+  - `owner`: The account owner of the repository or organization. The name is not case sensitive. (string, required)
+  - `repo`: The name of the repository. When provided, returns fields for this specific repository (inherited from its organization). When omitted, returns org-level fields directly. (string, optional)
+
 - **list_issue_types** - List available issue types
   - **Required OAuth Scopes**: `read:org`
   - **Accepted OAuth Scopes**: `admin:org`, `read:org`, `write:org`
diff --git a/pkg/github/__toolsnaps__/list_issue_fields.snap b/pkg/github/__toolsnaps__/list_issue_fields.snap
new file mode 100644
index 000000000..0eec8bc9e
--- /dev/null
+++ b/pkg/github/__toolsnaps__/list_issue_fields.snap
@@ -0,0 +1,24 @@
+{
+  "annotations": {
+    "readOnlyHint": true,
+    "title": "List issue fields"
+  },
+  "description": "List issue fields for a repository or organization. Returns field definitions including name, type (text, number, date, single_select), and for single_select fields the list of valid option names. When repo is omitted, returns org-level fields directly.",
+  "inputSchema": {
+    "properties": {
+      "owner": {
+        "description": "The account owner of the repository or organization. The name is not case sensitive.",
+        "type": "string"
+      },
+      "repo": {
+        "description": "The name of the repository. When provided, returns fields for this specific repository (inherited from its organization). When omitted, returns org-level fields directly.",
+        "type": "string"
+      }
+    },
+    "required": [
+      "owner"
+    ],
+    "type": "object"
+  },
+  "name": "list_issue_fields"
+}
\ No newline at end of file
diff --git a/pkg/github/issue_fields.go b/pkg/github/issue_fields.go
new file mode 100644
index 000000000..0649e4714
--- /dev/null
+++ b/pkg/github/issue_fields.go
@@ -0,0 +1,223 @@
+package github
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+
+	ghcontext "github.com/github/github-mcp-server/pkg/context"
+	ghErrors "github.com/github/github-mcp-server/pkg/errors"
+	"github.com/github/github-mcp-server/pkg/inventory"
+	"github.com/github/github-mcp-server/pkg/scopes"
+	"github.com/github/github-mcp-server/pkg/translations"
+	"github.com/github/github-mcp-server/pkg/utils"
+	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/modelcontextprotocol/go-sdk/mcp"
+	"github.com/shurcooL/githubv4"
+)
+
+// IssueField represents a repository issue field definition.
+type IssueField struct {
+	ID          string                         `json:"id"`
+	Name        string                         `json:"name"`
+	Description string                         `json:"description,omitempty"`
+	DataType    string                         `json:"data_type"`
+	Visibility  string                         `json:"visibility"`
+	Options     []IssueSingleSelectFieldOption `json:"options,omitempty"`
+}
+
+// IssueSingleSelectFieldOption represents an option for a single_select issue field.
+type IssueSingleSelectFieldOption struct {
+	ID          string `json:"id"`
+	Name        string `json:"name"`
+	Description string `json:"description,omitempty"`
+	Color       string `json:"color"`
+	Priority    *int   `json:"priority,omitempty"`
+}
+
+// issueFieldNode is the GraphQL fragment for a single issue field in the IssueFields union.
+// Only the fragment matching __typename is populated; read from the matching fragment.
+type issueFieldNode struct {
+	TypeName       githubv4.String `graphql:"__typename"`
+	IssueFieldText struct {
+		ID          githubv4.ID
+		Name        githubv4.String
+		Description githubv4.String
+		DataType    githubv4.String
+		Visibility  githubv4.String
+	} `graphql:"... on IssueFieldText"`
+	IssueFieldNumber struct {
+		ID          githubv4.ID
+		Name        githubv4.String
+		Description githubv4.String
+		DataType    githubv4.String
+		Visibility  githubv4.String
+	} `graphql:"... on IssueFieldNumber"`
+	IssueFieldDate struct {
+		ID          githubv4.ID
+		Name        githubv4.String
+		Description githubv4.String
+		DataType    githubv4.String
+		Visibility  githubv4.String
+	} `graphql:"... on IssueFieldDate"`
+	IssueFieldSingleSelect struct {
+		ID          githubv4.ID
+		Name        githubv4.String
+		Description githubv4.String
+		DataType    githubv4.String
+		Visibility  githubv4.String
+		Options     []struct {
+			ID          githubv4.ID
+			Name        githubv4.String
+			Description githubv4.String
+			Color       githubv4.String
+			Priority    *int
+		}
+	} `graphql:"... on IssueFieldSingleSelect"`
+}
+
+// issueFieldsRepoQuery is the GraphQL query for listing issue fields on a repository.
+type issueFieldsRepoQuery struct {
+	Repository struct {
+		IssueFields struct {
+			Nodes []issueFieldNode
+		} `graphql:"issueFields(first: 100)"`
+	} `graphql:"repository(owner: $owner, name: $name)"`
+}
+
+// issueFieldsOrgQuery is the GraphQL query for listing issue fields on an organization.
+type issueFieldsOrgQuery struct {
+	Organization struct {
+		IssueFields struct {
+			Nodes []issueFieldNode
+		} `graphql:"issueFields(first: 100)"`
+	} `graphql:"organization(login: $login)"`
+}
+
+// ListIssueFields creates a tool to list issue field definitions for a repository or organization.
+func ListIssueFields(t translations.TranslationHelperFunc) inventory.ServerTool {
+	return NewTool(
+		ToolsetMetadataIssues,
+		mcp.Tool{
+			Name:        "list_issue_fields",
+			Description: t("TOOL_LIST_ISSUE_FIELDS_DESCRIPTION", "List issue fields for a repository or organization. Returns field definitions including name, type (text, number, date, single_select), and for single_select fields the list of valid option names. When repo is omitted, returns org-level fields directly."),
+			Annotations: &mcp.ToolAnnotations{
+				Title:        t("TOOL_LIST_ISSUE_FIELDS_USER_TITLE", "List issue fields"),
+				ReadOnlyHint: true,
+			},
+			InputSchema: &jsonschema.Schema{
+				Type: "object",
+				Properties: map[string]*jsonschema.Schema{
+					"owner": {
+						Type:        "string",
+						Description: "The account owner of the repository or organization. The name is not case sensitive.",
+					},
+					"repo": {
+						Type:        "string",
+						Description: "The name of the repository. When provided, returns fields for this specific repository (inherited from its organization). When omitted, returns org-level fields directly.",
+					},
+				},
+				Required: []string{"owner"},
+			},
+		},
+		[]scopes.Scope{scopes.Repo, scopes.ReadOrg},
+		func(ctx context.Context, deps ToolDependencies, _ *mcp.CallToolRequest, args map[string]any) (*mcp.CallToolResult, any, error) {
+			owner, err := RequiredParam[string](args, "owner")
+			if err != nil {
+				return utils.NewToolResultError(err.Error()), nil, nil
+			}
+			repo, err := OptionalParam[string](args, "repo")
+			if err != nil {
+				return utils.NewToolResultError(err.Error()), nil, nil
+			}
+
+			gqlClient, err := deps.GetGQLClient(ctx)
+			if err != nil {
+				return utils.NewToolResultErrorFromErr("failed to get GitHub GraphQL client", err), nil, nil
+			}
+
+			ctxWithFeatures := ghcontext.WithGraphQLFeatures(ctx, "issue_fields", "repo_issue_fields")
+			var nodes []issueFieldNode
+			if repo != "" {
+				var query issueFieldsRepoQuery
+				vars := map[string]any{
+					"owner": githubv4.String(owner),
+					"name":  githubv4.String(repo),
+				}
+				if err := gqlClient.Query(ctxWithFeatures, &query, vars); err != nil {
+					return ghErrors.NewGitHubGraphQLErrorResponse(ctx, "failed to list issue fields", err), nil, nil
+				}
+				nodes = query.Repository.IssueFields.Nodes
+			} else {
+				var query issueFieldsOrgQuery
+				vars := map[string]any{
+					"login": githubv4.String(owner),
+				}
+				if err := gqlClient.Query(ctxWithFeatures, &query, vars); err != nil {
+					return ghErrors.NewGitHubGraphQLErrorResponse(ctx, "failed to list issue fields", err), nil, nil
+				}
+				nodes = query.Organization.IssueFields.Nodes
+			}
+
+			fields := make([]IssueField, 0, len(nodes))
+			for _, node := range nodes {
+				var f IssueField
+				// Read from the fragment matching __typename; the other fragments are zero-valued.
+				switch string(node.TypeName) {
+				case "IssueFieldSingleSelect":
+					opts := make([]IssueSingleSelectFieldOption, 0, len(node.IssueFieldSingleSelect.Options))
+					for _, o := range node.IssueFieldSingleSelect.Options {
+						opts = append(opts, IssueSingleSelectFieldOption{
+							ID:          fmt.Sprintf("%v", o.ID),
+							Name:        string(o.Name),
+							Description: string(o.Description),
+							Color:       string(o.Color),
+							Priority:    o.Priority,
+						})
+					}
+					f = IssueField{
+						ID:          fmt.Sprintf("%v", node.IssueFieldSingleSelect.ID),
+						Name:        string(node.IssueFieldSingleSelect.Name),
+						Description: string(node.IssueFieldSingleSelect.Description),
+						DataType:    string(node.IssueFieldSingleSelect.DataType),
+						Visibility:  string(node.IssueFieldSingleSelect.Visibility),
+						Options:     opts,
+					}
+				case "IssueFieldText":
+					f = IssueField{
+						ID:          fmt.Sprintf("%v", node.IssueFieldText.ID),
+						Name:        string(node.IssueFieldText.Name),
+						Description: string(node.IssueFieldText.Description),
+						DataType:    string(node.IssueFieldText.DataType),
+						Visibility:  string(node.IssueFieldText.Visibility),
+					}
+				case "IssueFieldNumber":
+					f = IssueField{
+						ID:          fmt.Sprintf("%v", node.IssueFieldNumber.ID),
+						Name:        string(node.IssueFieldNumber.Name),
+						Description: string(node.IssueFieldNumber.Description),
+						DataType:    string(node.IssueFieldNumber.DataType),
+						Visibility:  string(node.IssueFieldNumber.Visibility),
+					}
+				case "IssueFieldDate":
+					f = IssueField{
+						ID:          fmt.Sprintf("%v", node.IssueFieldDate.ID),
+						Name:        string(node.IssueFieldDate.Name),
+						Description: string(node.IssueFieldDate.Description),
+						DataType:    string(node.IssueFieldDate.DataType),
+						Visibility:  string(node.IssueFieldDate.Visibility),
+					}
+				default:
+					continue
+				}
+				fields = append(fields, f)
+			}
+
+			r, err := json.Marshal(fields)
+			if err != nil {
+				return utils.NewToolResultErrorFromErr("failed to marshal issue fields", err), nil, nil
+			}
+
+			return utils.NewToolResultText(string(r)), nil, nil
+		})
+}
diff --git a/pkg/github/issue_fields_test.go b/pkg/github/issue_fields_test.go
new file mode 100644
index 000000000..238c0455b
--- /dev/null
+++ b/pkg/github/issue_fields_test.go
@@ -0,0 +1,300 @@
+package github
+
+import (
+	"context"
+	"encoding/json"
+	"testing"
+
+	"github.com/github/github-mcp-server/internal/githubv4mock"
+	"github.com/github/github-mcp-server/internal/toolsnaps"
+	"github.com/github/github-mcp-server/pkg/translations"
+	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/shurcooL/githubv4"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func Test_ListIssueFields(t *testing.T) {
+	// Verify tool definition
+	serverTool := ListIssueFields(translations.NullTranslationHelper)
+	tool := serverTool.Tool
+	require.NoError(t, toolsnaps.Test(tool.Name, tool))
+
+	assert.Equal(t, "list_issue_fields", tool.Name)
+	assert.NotEmpty(t, tool.Description)
+	assert.True(t, tool.Annotations.ReadOnlyHint)
+	assert.Contains(t, tool.InputSchema.(*jsonschema.Schema).Properties, "owner")
+	assert.Contains(t, tool.InputSchema.(*jsonschema.Schema).Properties, "repo")
+	assert.ElementsMatch(t, tool.InputSchema.(*jsonschema.Schema).Required, []string{"owner"})
+	assert.ElementsMatch(t, serverTool.RequiredScopes, []string{"repo", "read:org"})
+	assert.ElementsMatch(t, serverTool.AcceptedScopes, []string{"repo", "read:org", "write:org", "admin:org"})
+
+	queryStruct := issueFieldsRepoQuery{}
+	defaultVars := map[string]any{
+		"owner": githubv4.String("testowner"),
+		"name":  githubv4.String("testrepo"),
+	}
+	orgQueryStruct := issueFieldsOrgQuery{}
+	defaultOrgVars := map[string]any{
+		"login": githubv4.String("testowner"),
+	}
+
+	tests := []struct {
+		name            string
+		requestArgs     map[string]any
+		mockQueryStruct any
+		mockVars        map[string]any
+		gqlResponse     githubv4mock.GQLResponse
+		expectError     bool
+		expectedFields  []IssueField
+		expectedErrMsg  string
+	}{
+		{
+			name: "no fields returns empty list",
+			requestArgs: map[string]any{
+				"owner": "testowner",
+				"repo":  "testrepo",
+			},
+			gqlResponse: githubv4mock.DataResponse(map[string]any{
+				"repository": map[string]any{
+					"issueFields": map[string]any{
+						"nodes": []any{},
+					},
+				},
+			}),
+			expectedFields: []IssueField{},
+		},
+		{
+			name: "text field returned",
+			requestArgs: map[string]any{
+				"owner": "testowner",
+				"repo":  "testrepo",
+			},
+			gqlResponse: githubv4mock.DataResponse(map[string]any{
+				"repository": map[string]any{
+					"issueFields": map[string]any{
+						"nodes": []any{
+							map[string]any{
+								"__typename":  "IssueFieldText",
+								"id":          "IFT_1",
+								"name":        "DRI",
+								"description": "Directly responsible individual",
+								"dataType":    "TEXT",
+								"visibility":  "ORG_ONLY",
+							},
+						},
+					},
+				},
+			}),
+			expectedFields: []IssueField{
+				{
+					ID:          "IFT_1",
+					Name:        "DRI",
+					Description: "Directly responsible individual",
+					DataType:    "TEXT",
+					Visibility:  "ORG_ONLY",
+				},
+			},
+		},
+		{
+			name: "single_select field with options returned",
+			requestArgs: map[string]any{
+				"owner": "testowner",
+				"repo":  "testrepo",
+			},
+			gqlResponse: githubv4mock.DataResponse(map[string]any{
+				"repository": map[string]any{
+					"issueFields": map[string]any{
+						"nodes": []any{
+							map[string]any{
+								"__typename":  "IssueFieldSingleSelect",
+								"id":          "IFSS_1",
+								"name":        "Priority",
+								"description": "Level of importance",
+								"dataType":    "SINGLE_SELECT",
+								"visibility":  "ALL",
+								"options": []any{
+									map[string]any{
+										"id":    "OPT_1",
+										"name":  "High",
+										"color": "red",
+									},
+									map[string]any{
+										"id":    "OPT_2",
+										"name":  "Low",
+										"color": "blue",
+									},
+								},
+							},
+						},
+					},
+				},
+			}),
+			expectedFields: []IssueField{
+				{
+					ID:          "IFSS_1",
+					Name:        "Priority",
+					Description: "Level of importance",
+					DataType:    "SINGLE_SELECT",
+					Visibility:  "ALL",
+					Options: []IssueSingleSelectFieldOption{
+						{ID: "OPT_1", Name: "High", Color: "red"},
+						{ID: "OPT_2", Name: "Low", Color: "blue"},
+					},
+				},
+			},
+		},
+		{
+			name: "missing owner parameter",
+			requestArgs: map[string]any{
+				"repo": "testrepo",
+			},
+			gqlResponse:    githubv4mock.DataResponse(map[string]any{}),
+			expectError:    true,
+			expectedErrMsg: "missing required parameter: owner",
+		},
+		{
+			name: "no repo returns org-level fields",
+			requestArgs: map[string]any{
+				"owner": "testowner",
+			},
+			mockQueryStruct: orgQueryStruct,
+			mockVars:        defaultOrgVars,
+			gqlResponse: githubv4mock.DataResponse(map[string]any{
+				"organization": map[string]any{
+					"issueFields": map[string]any{
+						"nodes": []any{
+							map[string]any{
+								"__typename": "IssueFieldText",
+								"id":         "IFT_1",
+								"name":       "DRI",
+								"dataType":   "TEXT",
+								"visibility": "ORG_ONLY",
+							},
+						},
+					},
+				},
+			}),
+			expectedFields: []IssueField{
+				{ID: "IFT_1", Name: "DRI", DataType: "TEXT", Visibility: "ORG_ONLY"},
+			},
+		},
+		{
+			name: "number field returned",
+			requestArgs: map[string]any{
+				"owner": "testowner",
+				"repo":  "testrepo",
+			},
+			gqlResponse: githubv4mock.DataResponse(map[string]any{
+				"repository": map[string]any{
+					"issueFields": map[string]any{
+						"nodes": []any{
+							map[string]any{
+								"__typename": "IssueFieldNumber",
+								"id":         "IFN_1",
+								"name":       "Engineering Staffing",
+								"dataType":   "NUMBER",
+								"visibility": "ORG_ONLY",
+							},
+						},
+					},
+				},
+			}),
+			expectedFields: []IssueField{
+				{ID: "IFN_1", Name: "Engineering Staffing", DataType: "NUMBER", Visibility: "ORG_ONLY"},
+			},
+		},
+		{
+			name: "date field returned",
+			requestArgs: map[string]any{
+				"owner": "testowner",
+				"repo":  "testrepo",
+			},
+			gqlResponse: githubv4mock.DataResponse(map[string]any{
+				"repository": map[string]any{
+					"issueFields": map[string]any{
+						"nodes": []any{
+							map[string]any{
+								"__typename": "IssueFieldDate",
+								"id":         "IFD_1",
+								"name":       "Target Date",
+								"dataType":   "DATE",
+								"visibility": "ORG_ONLY",
+							},
+						},
+					},
+				},
+			}),
+			expectedFields: []IssueField{
+				{ID: "IFD_1", Name: "Target Date", DataType: "DATE", Visibility: "ORG_ONLY"},
+			},
+		},
+		{
+			name: "graphql error returns failure",
+			requestArgs: map[string]any{
+				"owner": "testowner",
+				"repo":  "testrepo",
+			},
+			gqlResponse:    githubv4mock.ErrorResponse("boom"),
+			expectError:    true,
+			expectedErrMsg: "failed to list issue fields",
+		},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			qs := tc.mockQueryStruct
+			if qs == nil {
+				qs = queryStruct
+			}
+			vars := tc.mockVars
+			if vars == nil {
+				vars = defaultVars
+			}
+			mockedHTTPClient := githubv4mock.NewMockedHTTPClient(
+				githubv4mock.NewQueryMatcher(qs, vars, tc.gqlResponse),
+			)
+			gqlClient := githubv4.NewClient(mockedHTTPClient)
+			deps := BaseDeps{GQLClient: gqlClient}
+			handler := serverTool.Handler(deps)
+
+			request := createMCPRequest(tc.requestArgs)
+			result, err := handler(ContextWithDeps(context.Background(), deps), &request)
+
+			if tc.expectError {
+				if err != nil {
+					assert.Contains(t, err.Error(), tc.expectedErrMsg)
+					return
+				}
+				require.NotNil(t, result)
+				require.True(t, result.IsError)
+				errorContent := getErrorResult(t, result)
+				assert.Contains(t, errorContent.Text, tc.expectedErrMsg)
+				return
+			}
+
+			require.NoError(t, err)
+			require.NotNil(t, result)
+			require.False(t, result.IsError)
+			textContent := getTextResult(t, result)
+
+			var returnedFields []IssueField
+			err = json.Unmarshal([]byte(textContent.Text), &returnedFields)
+			require.NoError(t, err)
+			require.Equal(t, len(tc.expectedFields), len(returnedFields))
+			for i, expected := range tc.expectedFields {
+				assert.Equal(t, expected.ID, returnedFields[i].ID)
+				assert.Equal(t, expected.Name, returnedFields[i].Name)
+				assert.Equal(t, expected.DataType, returnedFields[i].DataType)
+				assert.Equal(t, expected.Visibility, returnedFields[i].Visibility)
+				if expected.Options != nil {
+					require.Equal(t, len(expected.Options), len(returnedFields[i].Options))
+					for j, opt := range expected.Options {
+						assert.Equal(t, opt.Name, returnedFields[i].Options[j].Name)
+						assert.Equal(t, opt.Color, returnedFields[i].Options[j].Color)
+					}
+				}
+			}
+		})
+	}
+}
diff --git a/pkg/github/tools.go b/pkg/github/tools.go
index f4c653bf8..6e08de7e6 100644
--- a/pkg/github/tools.go
+++ b/pkg/github/tools.go
@@ -209,6 +209,7 @@ func AllTools(t translations.TranslationHelperFunc) []inventory.ServerTool {
 		SearchIssues(t),
 		ListIssues(t),
 		ListIssueTypes(t),
+		ListIssueFields(t),
 		IssueWrite(t),
 		AddIssueComment(t),
 		SubIssueWrite(t),