Merge branch 'main' into make-consolidated-projects-default

Author: mattdholloway

.github/workflows/conformance.yml

@@ -0,0 +1,70 @@
+name: MCP Server Diff
+
+on:
+  pull_request:
+  push:
+    branches: [main]
+    tags: ['v*']
+
+permissions:
+  contents: read
+
+jobs:
+  mcp-diff:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+
+      - name: Run MCP Server Diff
+        uses: SamMorrowDrums/mcp-server-diff@v2
+        with:
+          setup_go: "true"
+          install_command: go mod download
+          start_command: go run ./cmd/github-mcp-server stdio
+          env_vars: |
+            GITHUB_PERSONAL_ACCESS_TOKEN=test-token
+          configurations: |
+            [
+              {"name": "default", "args": ""},
+              {"name": "read-only", "args": "--read-only"},
+              {"name": "dynamic-toolsets", "args": "--dynamic-toolsets"},
+              {"name": "read-only+dynamic", "args": "--read-only --dynamic-toolsets"},
+              {"name": "toolsets-repos", "args": "--toolsets=repos"},
+              {"name": "toolsets-issues", "args": "--toolsets=issues"},
+              {"name": "toolsets-pull_requests", "args": "--toolsets=pull_requests"},
+              {"name": "toolsets-repos,issues", "args": "--toolsets=repos,issues"},
+              {"name": "toolsets-all", "args": "--toolsets=all"},
+              {"name": "tools-get_me", "args": "--tools=get_me"},
+              {"name": "tools-get_me,list_issues", "args": "--tools=get_me,list_issues"},
+              {"name": "toolsets-repos+read-only", "args": "--toolsets=repos --read-only"},
+              {"name": "toolsets-all+dynamic", "args": "--toolsets=all --dynamic-toolsets"},
+              {"name": "toolsets-repos+dynamic", "args": "--toolsets=repos --dynamic-toolsets"},
+              {"name": "toolsets-repos,issues+dynamic", "args": "--toolsets=repos,issues --dynamic-toolsets"},
+              {
+                "name": "dynamic-tool-calls",
+                "args": "--dynamic-toolsets",
+                "custom_messages": [
+                  {"id": 10, "name": "list_toolsets_before", "message": {"jsonrpc": "2.0", "id": 10, "method": "tools/call", "params": {"name": "list_available_toolsets", "arguments": {}}}},
+                  {"id": 11, "name": "get_toolset_tools", "message": {"jsonrpc": "2.0", "id": 11, "method": "tools/call", "params": {"name": "get_toolset_tools", "arguments": {"toolset": "repos"}}}},
+                  {"id": 12, "name": "enable_toolset", "message": {"jsonrpc": "2.0", "id": 12, "method": "tools/call", "params": {"name": "enable_toolset", "arguments": {"toolset": "repos"}}}},
+                  {"id": 13, "name": "list_toolsets_after", "message": {"jsonrpc": "2.0", "id": 13, "method": "tools/call", "params": {"name": "list_available_toolsets", "arguments": {}}}}
+                ]
+              }
+            ]
+
+      - name: Add interpretation note
+        if: always()
+        run: |
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "---" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "ℹ️ **Note:** Differences may be intentional improvements." >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "Common expected differences:" >> $GITHUB_STEP_SUMMARY
+          echo "- New tools/toolsets added" >> $GITHUB_STEP_SUMMARY
+          echo "- Tool descriptions updated" >> $GITHUB_STEP_SUMMARY
+          echo "- Capability changes (intentional improvements)" >> $GITHUB_STEP_SUMMARY

.github/workflows/mcp-diff.yml

@@ -98,6 +98,49 @@ See [Remote Server Documentation](docs/remote-server.md) for full details on rem
 
 When no toolsets are specified, [default toolsets](#default-toolset) are used.
 
+#### Insiders Mode
+
+> **Try new features early!** The remote server offers an insiders version with early access to new features and experimental tools.
+
+<table>
+<tr><th>Using URL Path</th><th>Using Header</th></tr>
+<tr valign=top>
+<td>
+
+```json
+{
+  "servers": {
+    "github": {
+      "type": "http",
+      "url": "https://api.githubcopilot.com/mcp/insiders"
+    }
+  }
+}
+```
+
+</td>
+<td>
+
+```json
+{
+  "servers": {
+    "github": {
+      "type": "http",
+      "url": "https://api.githubcopilot.com/mcp/",
+      "headers": {
+        "X-MCP-Insiders": "true"
+      }
+    }
+  }
+}
+```
+
+</td>
+</tr>
+</table>
+
+See [Remote Server Documentation](docs/remote-server.md#insiders-mode) for more details and examples.
+
 #### GitHub Enterprise
 
 ##### GitHub Enterprise Cloud with data residency (ghe.com)
@@ -480,6 +523,31 @@ To keep the default configuration and add additional toolsets:
 GITHUB_TOOLSETS="default,stargazers" ./github-mcp-server
 ```
 
+### Insiders Mode
+
+The local GitHub MCP Server offers an insiders version with early access to new features and experimental tools.
+
+1. **Using Command Line Argument**:
+
+   ```bash
+   ./github-mcp-server --insider-mode
+   ```
+
+2. **Using Environment Variable**:
+
+   ```bash
+   GITHUB_INSIDER_MODE=true ./github-mcp-server
+   ```
+
+When using Docker:
+
+```bash
+docker run -i --rm \
+  -e GITHUB_PERSONAL_ACCESS_TOKEN=<your-token> \
+  -e GITHUB_INSIDER_MODE=true \
+  ghcr.io/github/github-mcp-server
+```
+
 ### Available Toolsets
 
 The following sets of tools are available:

README.md

@@ -67,6 +67,9 @@ The Remote GitHub MCP server has optional headers equivalent to the Local server
 - `X-MCP-Lockdown`: Enables lockdown mode, hiding public issue details created by users without push access.
     - Equivalent to `GITHUB_LOCKDOWN_MODE` env var for Local server.
     - If this header is empty, "false", "f", "no", "n", "0", or "off" (ignoring whitespace and case), it will be interpreted as false. All other values are interpreted as true.
+- `X-MCP-Insiders`: Enables insiders mode for early access to new features.
+    - Equivalent to `GITHUB_INSIDER_MODE` env var or `--insider-mode` flag for Local server.
+    - If this header is empty, "false", "f", "no", "n", "0", or "off" (ignoring whitespace and case), it will be interpreted as false. All other values are interpreted as true.
 
 > **Looking for examples?** See the [Server Configuration Guide](./server-configuration.md) for common recipes like minimal setups, read-only mode, and combining tools with toolsets.
 
@@ -84,18 +87,49 @@ Example:
 }
 ```
 
+### Insiders Mode
+
+The remote GitHub MCP Server offers an insiders version with early access to new features and experimental tools. You can enable insiders mode in two ways:
+
+1. **Via URL path** - Append `/insiders` to the URL:
+
+   ```json
+   {
+       "type": "http",
+       "url": "https://api.githubcopilot.com/mcp/insiders"
+   }
+   ```
+
+2. **Via header** - Set the `X-MCP-Insiders` header to `true`:
+
+   ```json
+   {
+       "type": "http",
+       "url": "https://api.githubcopilot.com/mcp/",
+       "headers": {
+           "X-MCP-Insiders": "true"
+       }
+   }
+   ```
+
+Both methods can be combined with other path modifiers (like `/readonly`) and headers.
+
 ### URL Path Parameters
 
 The Remote GitHub MCP server supports the following URL path patterns:
 
 - `/` - Default toolset (see ["default" toolset](../README.md#default-toolset))
 - `/readonly` - Default toolset in read-only mode
+- `/insiders` - Default toolset with insiders mode enabled
+- `/insiders/readonly` - Default toolset with insiders mode in read-only mode
 - `/x/all` - All available toolsets
 - `/x/all/readonly` - All available toolsets in read-only mode
+- `/x/all/insiders` - All available toolsets with insiders mode enabled
 - `/x/{toolset}` - Single specific toolset
 - `/x/{toolset}/readonly` - Single specific toolset in read-only mode
+- `/x/{toolset}/insiders` - Single specific toolset with insiders mode enabled
 
-Note: `{toolset}` can only be a single toolset, not a comma-separated list. To combine multiple toolsets, use the `X-MCP-Toolsets` header instead.
+Note: `{toolset}` can only be a single toolset, not a comma-separated list. To combine multiple toolsets, use the `X-MCP-Toolsets` header instead. Path modifiers like `/readonly` and `/insiders` can be combined with the `X-MCP-Insiders` or `X-MCP-Readonly` headers.
 
 Example:
 

docs/remote-server.md

@@ -171,16 +171,31 @@ func NewMCPServer(cfg MCPServerConfig) (*mcp.Server, error) {
 
 	enabledToolsets := resolveEnabledToolsets(cfg)
 
-	// For instruction generation, we need actual toolset names (not nil).
-	// nil means "use defaults" in inventory, so expand it for instructions.
-	instructionToolsets := enabledToolsets
-	if instructionToolsets == nil {
-		instructionToolsets = github.GetDefaultToolsetIDs()
+	// Create feature checker
+	featureChecker := createFeatureChecker(cfg.EnabledFeatures)
+
+	// Build and register the tool/resource/prompt inventory
+	inventoryBuilder := github.NewInventory(cfg.Translator).
+		WithDeprecatedAliases(github.DeprecatedToolAliases).
+		WithReadOnly(cfg.ReadOnly).
+		WithToolsets(enabledToolsets).
+		WithTools(cfg.EnabledTools).
+		WithFeatureChecker(featureChecker).
+		WithServerInstructions()
+
+	// Apply token scope filtering if scopes are known (for PAT filtering)
+	if cfg.TokenScopes != nil {
+		inventoryBuilder = inventoryBuilder.WithFilter(github.CreateToolScopeFilter(cfg.TokenScopes))
+	}
+
+	inventory, err := inventoryBuilder.Build()
+	if err != nil {
+		return nil, fmt.Errorf("failed to build inventory: %w", err)
 	}
 
 	// Create the MCP server
 	serverOpts := &mcp.ServerOptions{
-		Instructions: github.GenerateInstructions(instructionToolsets),
+		Instructions: inventory.Instructions(),
 		Logger:       cfg.Logger,
 		CompletionHandler: github.CompletionsHandler(func(_ context.Context) (*gogithub.Client, error) {
 			return clients.rest, nil
@@ -203,9 +218,6 @@ func NewMCPServer(cfg MCPServerConfig) (*mcp.Server, error) {
 	ghServer.AddReceivingMiddleware(addGitHubAPIErrorToContext)
 	ghServer.AddReceivingMiddleware(addUserAgentsMiddleware(cfg, clients.rest, clients.gqlHTTP))
 
-	// Create feature checker
-	featureChecker := createFeatureChecker(cfg.EnabledFeatures)
-
 	// Create dependencies for tool handlers
 	deps := github.NewBaseDeps(
 		clients.rest,
@@ -228,24 +240,6 @@ func NewMCPServer(cfg MCPServerConfig) (*mcp.Server, error) {
 		}
 	})
 
-	// Build and register the tool/resource/prompt inventory
-	inventoryBuilder := github.NewInventory(cfg.Translator).
-		WithDeprecatedAliases(github.DeprecatedToolAliases).
-		WithReadOnly(cfg.ReadOnly).
-		WithToolsets(enabledToolsets).
-		WithTools(cfg.EnabledTools).
-		WithFeatureChecker(featureChecker)
-
-	// Apply token scope filtering if scopes are known (for PAT filtering)
-	if cfg.TokenScopes != nil {
-		inventoryBuilder = inventoryBuilder.WithFilter(github.CreateToolScopeFilter(cfg.TokenScopes))
-	}
-
-	inventory, err := inventoryBuilder.Build()
-	if err != nil {
-		return nil, fmt.Errorf("failed to build inventory: %w", err)
-	}
-
 	if unrecognized := inventory.UnrecognizedToolsets(); len(unrecognized) > 0 {
 		fmt.Fprintf(os.Stderr, "Warning: unrecognized toolsets ignored: %s\n", strings.Join(unrecognized, ", "))
 	}

internal/ghmcp/server.go

@@ -23,8 +23,8 @@
         "type": "string"
       },
       "custom_instructions": {
-        "type": "string",
-        "description": "Optional custom instructions to guide the agent beyond the issue body. Use this to provide additional context, constraints, or guidance that is not captured in the issue description"
+        "description": "Optional custom instructions to guide the agent beyond the issue body. Use this to provide additional context, constraints, or guidance that is not captured in the issue description",
+        "type": "string"
       },
       "issue_number": {
         "description": "Issue number",

pkg/github/__toolsnaps__/assign_copilot_to_issue.snap

@@ -31,11 +31,11 @@
         "type": "string"
       },
       "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.",
+        "description": "The owner (user or organization login). The name is not case sensitive.",
         "type": "string"
       },
       "owner_type": {
-        "description": "Owner type",
+        "description": "Owner type (user or org). If not provided, will be automatically detected.",
         "enum": [
           "user",
           "org"
@@ -49,7 +49,6 @@
     },
     "required": [
       "method",
-      "owner_type",
       "owner",
       "project_number"
     ],