Remove unused toolset instructions and simplify test cases for clarity

Author: olaservo

pkg/github/instructions.go

@@ -18,11 +18,6 @@ func GenerateInstructions(enabledToolsets []string) string {
 		}
 	}
 
-	// Cross-toolset conditional instructions
-	if contains(enabledToolsets, "issues") && contains(enabledToolsets, "pull_requests") {
-		instructions = append(instructions, "Link issues to PRs using 'closes #123' or 'fixes #123' in PR descriptions.")
-	}
-	
 	// Base instruction with context management
 	baseInstruction := "The GitHub MCP Server provides GitHub API tools. GitHub API responses can overflow context windows. Strategy: 1) Always prefer 'search_*' tools over 'list_*' tools when possible - search tools return filtered results, 2) Process large datasets in batches rather than all at once, 3) For summarization tasks, fetch minimal data first, then drill down into specifics, 4) When analyzing multiple items (issues, PRs, etc), process in groups of 5-10 to manage context."
 
@@ -37,24 +32,17 @@ func getToolsetInstructions(toolset string) string {
 	switch toolset {
 	case "pull_requests":
 		return "PR review workflow: Use 'create_pending_pull_request_review' → 'add_comment_to_pending_review' → 'submit_pending_pull_request_review' for complex reviews with line-specific comments."
-	case "actions":
-		return "CI/CD debugging: Use 'get_job_logs' with 'failed_only=true' and 'return_content=true' for immediate log analysis. Use 'rerun_failed_jobs' instead of 'rerun_workflow_run' to save resources."
 	case "issues":
 		return "Issue workflow: Check 'list_issue_types' first for organizations to use proper issue types. Use 'search_issues' before creating new issues to avoid duplicates. Always set 'state_reason' when closing issues."
-	case "repos":
-		return "File operations: Use 'get_file_contents' to check if file exists before 'create_or_update_file'. Always specify 'sha' parameter when updating existing files. Use 'push_files' for multiple file operations in single commit."
 	case "notifications":
 		return "Notifications: Filter by 'participating' for issues/PRs you're involved in. Use 'mark_all_notifications_read' with repository filters to avoid marking unrelated notifications."
-	case "gists":
-		return "Gists: Use 'list_gists' with 'since' parameter to find recent gists. Specify 'public=false' for private gists in 'create_gist'."
 	case "discussions":
 		return "Discussions: Use 'list_discussion_categories' to understand available categories before creating discussions. Filter by category for better organization."
 	default:
 		return ""
 	}
 }
 
-
 // contains checks if a slice contains a specific string
 func contains(slice []string, item string) bool {
 	for _, s := range slice {
@@ -63,4 +51,4 @@ func contains(slice []string, item string) bool {
 		}
 	}
 	return false
-}
+}

pkg/github/instructions_test.go

@@ -38,15 +38,6 @@ func TestGenerateInstructions(t *testing.T) {
 				"submit_pending_pull_request_review",
 			},
 		},
-		{
-			name:            "actions toolset",
-			enabledToolsets: []string{"actions"},
-			expectedContains: []string{
-				"get_job_logs",
-				"failed_only=true",
-				"rerun_failed_jobs",
-			},
-		},
 		{
 			name:            "cross-toolset instructions",
 			enabledToolsets: []string{"context", "pull_requests"},
@@ -59,10 +50,9 @@ func TestGenerateInstructions(t *testing.T) {
 			name:            "issues and pull_requests combination",
 			enabledToolsets: []string{"issues", "pull_requests"},
 			expectedContains: []string{
-				"closes #123",
-				"fixes #123",
 				"search_issues",
 				"list_issue_types",
+				"create_pending_pull_request_review",
 			},
 		},
 	}
@@ -96,18 +86,10 @@ func TestGetToolsetInstructions(t *testing.T) {
 			toolset:  "pull_requests",
 			expected: "create_pending_pull_request_review",
 		},
-		{
-			toolset:  "actions",
-			expected: "get_job_logs",
-		},
 		{
 			toolset:  "issues",
 			expected: "list_issue_types",
 		},
-		{
-			toolset:  "repos",
-			expected: "get_file_contents",
-		},
 		{
 			toolset:  "nonexistent",
 			expected: "",
@@ -129,4 +111,3 @@ func TestGetToolsetInstructions(t *testing.T) {
 		})
 	}
 }
-