diff --git a/pkg/github/issues.go b/pkg/github/issues.go
index 9c4a0ec2..53ce61bf 100644
--- a/pkg/github/issues.go
+++ b/pkg/github/issues.go
@@ -144,9 +144,23 @@ func searchIssues(client *github.Client, t translations.TranslationHelperFunc) (
 			),
 			mcp.WithString("sort",
 				mcp.Description("Sort field (comments, reactions, created, etc.)"),
+				mcp.Enum(
+					"comments",
+					"reactions",
+					"reactions-+1",
+					"reactions--1",
+					"reactions-smile",
+					"reactions-thinking_face",
+					"reactions-heart",
+					"reactions-tada",
+					"interactions",
+					"created",
+					"updated",
+				),
 			),
 			mcp.WithString("order",
 				mcp.Description("Sort order ('asc' or 'desc')"),
+				mcp.Enum("asc", "desc"),
 			),
 			mcp.WithNumber("per_page",
 				mcp.Description("Results per page (max 100)"),
@@ -322,6 +336,7 @@ func listIssues(client *github.Client, t translations.TranslationHelperFunc) (to
 			),
 			mcp.WithString("state",
 				mcp.Description("Filter by state ('open', 'closed', 'all')"),
+				mcp.Enum("open", "closed", "all"),
 			),
 			mcp.WithArray("labels",
 				mcp.Description("Filter by labels"),
@@ -333,9 +348,11 @@ func listIssues(client *github.Client, t translations.TranslationHelperFunc) (to
 			),
 			mcp.WithString("sort",
 				mcp.Description("Sort by ('created', 'updated', 'comments')"),
+				mcp.Enum("created", "updated", "comments"),
 			),
 			mcp.WithString("direction",
 				mcp.Description("Sort direction ('asc', 'desc')"),
+				mcp.Enum("asc", "desc"),
 			),
 			mcp.WithString("since",
 				mcp.Description("Filter by date (ISO 8601 timestamp)"),
diff --git a/pkg/github/search.go b/pkg/github/search.go
index 904dc737..fc81432d 100644
--- a/pkg/github/search.go
+++ b/pkg/github/search.go
@@ -84,6 +84,7 @@ func searchCode(client *github.Client, t translations.TranslationHelperFunc) (to
 			),
 			mcp.WithString("order",
 				mcp.Description("Sort order ('asc' or 'desc')"),
+				mcp.Enum("asc", "desc"),
 			),
 			mcp.WithNumber("per_page",
 				mcp.Description("Results per page (max 100)"),
@@ -156,9 +157,11 @@ func searchUsers(client *github.Client, t translations.TranslationHelperFunc) (t
 			),
 			mcp.WithString("sort",
 				mcp.Description("Sort field (followers, repositories, joined)"),
+				mcp.Enum("followers", "repositories", "joined"),
 			),
 			mcp.WithString("order",
 				mcp.Description("Sort order ('asc' or 'desc')"),
+				mcp.Enum("asc", "desc"),
 			),
 			mcp.WithNumber("per_page",
 				mcp.Description("Results per page (max 100)"),