Merge branch 'main' into dependabot/go_modules/github.com/mark3labs/mcp-go-0.40.0

Author: JoannaaKL

.github/workflows/docker-publish.yml

@@ -14,6 +14,13 @@ on:
     tags: ["v*.*.*"]
   pull_request:
     branches: ["main", "next"]
+  workflow_dispatch:
+    inputs:
+        description:
+          required: false
+          description: "Description of the run."
+          type: string
+          default: "Manual run"
 
 env:
   # Use docker.io for Docker Hub if empty

.github/workflows/registry-releaser.yml

@@ -0,0 +1,49 @@
+name: Publish to MCP Registry
+
+on:
+  push:
+    tags: ["v*"]  # Triggers on version tags like v1.0.0
+  workflow_dispatch:  # Allow manual triggering
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write  # Required for OIDC authentication
+      contents: read
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v5
+
+      - name: Fetch tags
+        run: git fetch --tags
+
+      - name: Install MCP Publisher
+        run: |
+          curl -L "https://github.com/modelcontextprotocol/registry/releases/download/v1.0.0/mcp-publisher_1.0.0_$(uname -s | tr '[:upper:]' '[:lower:]')_$(uname -m | sed 's/x86_64/amd64/;s/aarch64/arm64/').tar.gz" | tar xz mcp-publisher
+
+      - name: Update server.json version
+        run: |
+          if [[ "${{ github.ref_type }}" == "tag" ]]; then
+            # Use the tag that triggered the workflow
+            TAG_VERSION=$(echo "${{ github.ref_name }}" | sed 's/^v//')
+            echo "Using triggered tag: ${{ github.ref_name }}"
+          else
+            # Fallback to latest tag (for manual triggers)
+            LATEST_TAG=$(git tag --sort=-version:refname | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+(-.*)?$' | head -n 1)
+            if [ -z "$LATEST_TAG" ]; then
+              echo "❌ No release tag found. Cannot determine version."
+              exit 1
+            fi
+            TAG_VERSION=$(echo "$LATEST_TAG" | sed 's/^v//')
+            echo "Using latest tag: $LATEST_TAG"
+          fi
+          sed -i "s/\${VERSION}/$TAG_VERSION/g" server.json
+          echo "Updated server.json version to $TAG_VERSION"
+
+      - name: Login to MCP Registry
+        run: ./mcp-publisher login github-oidc
+
+      - name: Publish to MCP Registry
+        run: ./mcp-publisher publish

README.md

@@ -658,10 +658,19 @@ The following sets of tools are available (all are on by default):
 
 <summary>Projects</summary>
 
+- **get_project** - Get project
+  - `owner`: If owner_type == user it is the handle for the GitHub user account. If owner_type == org it is the name of the organization. The name is not case sensitive. (string, required)
+  - `owner_type`: Owner type (string, required)
+  - `project_number`: The project's number (number, required)
+
+- **list_project_fields** - List project fields
+  - `owner`: If owner_type == user it is the handle for the GitHub user account. If owner_type == org it is the name of the organization. The name is not case sensitive. (string, required)
+  - `owner_type`: Owner type (string, required)
+  - `per_page`: Number of results per page (max 100, default: 30) (number, optional)
+  - `projectNumber`: The project's number. (string, required)
+
 - **list_projects** - List projects
-  - `after`: Cursor for items after (forward pagination) (string, optional)
-  - `before`: Cursor for items before (backwards pagination) (string, optional)
-  - `owner`: If owner_type == user it is the handle for the GitHub user account. If owner_type == organization it is the name of the organization. The name is not case sensitive. (string, required)
+  - `owner`: If owner_type == user it is the handle for the GitHub user account. If owner_type == org it is the name of the organization. The name is not case sensitive. (string, required)
   - `owner_type`: Owner type (string, required)
   - `per_page`: Number of results per page (max 100, default: 30) (number, optional)
   - `query`: Filter projects by a search query (matches title and description) (string, optional)
@@ -1017,6 +1026,17 @@ The following sets of tools are available (all are on by default):
 
 </details>
 
+<details>
+
+<summary>Copilot Spaces</summary>
+
+-   **get_copilot_space** - Get Copilot Space
+    -   `owner`: The owner of the space. (string, required)
+    -   `name`: The name of the space. (string, required)
+
+-   **list_copilot_spaces** - List Copilot Spaces
+</details>
+
 #### Specifying Toolsets
 
 To specify toolsets you want available to the LLM, you can pass an allow-list in two ways:

internal/ghmcp/server.go

@@ -105,8 +105,6 @@ func NewMCPServer(cfg MCPServerConfig) (*server.MCPServer, error) {
 		},
 	}
 
-	ghServer := github.NewServer(cfg.Version, server.WithHooks(hooks))
-
 	enabledToolsets := cfg.EnabledToolsets
 	if cfg.DynamicToolsets {
 		// filter "all" from the enabled toolsets
@@ -118,6 +116,14 @@ func NewMCPServer(cfg MCPServerConfig) (*server.MCPServer, error) {
 		}
 	}
 
+	// Generate instructions based on enabled toolsets
+	instructions := github.GenerateInstructions(enabledToolsets)
+	
+	ghServer := github.NewServer(cfg.Version, 
+		server.WithInstructions(instructions),
+		server.WithHooks(hooks),
+	)
+
 	getClient := func(_ context.Context) (*gogithub.Client, error) {
 		return restClient, nil // closing over client
 	}

pkg/github/__toolsnaps__/get_project.snap

@@ -0,0 +1,34 @@
+{
+  "annotations": {
+    "title": "Get project",
+    "readOnlyHint": true
+  },
+  "description": "Get Project for a user or org",
+  "inputSchema": {
+    "properties": {
+      "owner": {
+        "description": "If owner_type == user it is the handle for the GitHub user account. If owner_type == org it is the name of the organization. The name is not case sensitive.",
+        "type": "string"
+      },
+      "owner_type": {
+        "description": "Owner type",
+        "enum": [
+          "user",
+          "org"
+        ],
+        "type": "string"
+      },
+      "project_number": {
+        "description": "The project's number",
+        "type": "number"
+      }
+    },
+    "required": [
+      "project_number",
+      "owner_type",
+      "owner"
+    ],
+    "type": "object"
+  },
+  "name": "get_project"
+}

pkg/github/__toolsnaps__/list_project_fields.snap

@@ -0,0 +1,38 @@
+{
+  "annotations": {
+    "title": "List project fields",
+    "readOnlyHint": true
+  },
+  "description": "List Project fields for a user or org",
+  "inputSchema": {
+    "properties": {
+      "owner": {
+        "description": "If owner_type == user it is the handle for the GitHub user account. If owner_type == org it is the name of the organization. The name is not case sensitive.",
+        "type": "string"
+      },
+      "owner_type": {
+        "description": "Owner type",
+        "enum": [
+          "user",
+          "org"
+        ],
+        "type": "string"
+      },
+      "per_page": {
+        "description": "Number of results per page (max 100, default: 30)",
+        "type": "number"
+      },
+      "projectNumber": {
+        "description": "The project's number.",
+        "type": "string"
+      }
+    },
+    "required": [
+      "owner_type",
+      "owner",
+      "projectNumber"
+    ],
+    "type": "object"
+  },
+  "name": "list_project_fields"
+}

pkg/github/__toolsnaps__/list_projects.snap

@@ -3,26 +3,18 @@
     "title": "List projects",
     "readOnlyHint": true
   },
-  "description": "List Projects for a user or organization",
+  "description": "List Projects for a user or org",
   "inputSchema": {
     "properties": {
-      "after": {
-        "description": "Cursor for items after (forward pagination)",
-        "type": "string"
-      },
-      "before": {
-        "description": "Cursor for items before (backwards pagination)",
-        "type": "string"
-      },
       "owner": {
-        "description": "If owner_type == user it is the handle for the GitHub user account. If owner_type == organization it is the name of the organization. The name is not case sensitive.",
+        "description": "If owner_type == user it is the handle for the GitHub user account. If owner_type == org it is the name of the organization. The name is not case sensitive.",
         "type": "string"
       },
       "owner_type": {
         "description": "Owner type",
         "enum": [
           "user",
-          "organization"
+          "org"
         ],
         "type": "string"
       },

pkg/github/instructions.go

@@ -0,0 +1,60 @@
+package github
+
+import (
+	"os"
+	"slices"
+	"strings"
+)
+
+// GenerateInstructions creates server instructions based on enabled toolsets
+func GenerateInstructions(enabledToolsets []string) string {
+	// For testing - add a flag to disable instructions
+	if os.Getenv("DISABLE_INSTRUCTIONS") == "true" {
+		return "" // Baseline mode
+	}
+	
+	var instructions []string
+	
+	// Core instruction - always included if context toolset enabled
+	if slices.Contains(enabledToolsets, "context") {
+		instructions = append(instructions, "Always call 'get_me' first to understand current user permissions and context.")
+	}
+	
+	// Individual toolset instructions
+	for _, toolset := range enabledToolsets {
+		if inst := getToolsetInstructions(toolset); inst != "" {
+			instructions = append(instructions, inst)
+		}
+	}
+	
+	// Base instruction with context management
+	baseInstruction := `The GitHub MCP Server provides tools to interact with GitHub platform.
+
+Tool selection guidance:
+	1. Use 'list_*' tools for broad, simple retrieval and pagination of all items of a type (e.g., all issues, all PRs, all branches) with basic filtering.
+	2. Use 'search_*' tools for targeted queries with specific criteria, keywords, or complex filters (e.g., issues with certain text, PRs by author, code containing functions).
+
+Context management:
+	1. Use pagination whenever possible with batches of 5-10 items.
+	2. Use minimal_output parameter set to true if the full information is not needed to accomplish a task.`
+
+	allInstructions := []string{baseInstruction}
+	allInstructions = append(allInstructions, instructions...)
+	
+	return strings.Join(allInstructions, " ")
+}
+
+// getToolsetInstructions returns specific instructions for individual toolsets
+func getToolsetInstructions(toolset string) string {
+	switch toolset {
+	case "pull_requests":
+		return "## Pull Requests\n\nPR review workflow: Always use 'create_pending_pull_request_review' → 'add_comment_to_pending_review' → 'submit_pending_pull_request_review' for complex reviews with line-specific comments."
+	case "issues":
+		return "## Issues\n\nCheck '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 "discussions":
+		return "## Discussions\n\nUse 'list_discussion_categories' to understand available categories before creating discussions. Filter by category for better organization."
+	default:
+		return ""
+	}
+}
+