Merge remote-tracking branch 'origin/main' into mcp-ui-apps-advanced

# Conflicts:
#	Dockerfile
#	pkg/github/issues.go
#	pkg/github/pullrequests.go
#	pkg/inventory/builder.go
#	ui/package-lock.json
#	ui/src/apps/issue-write/App.tsx
#	ui/src/apps/pr-write/App.tsx
#	ui/src/components/MarkdownEditor.tsx

Author: mattdholloway

.github/workflows/docker-publish.yml

@@ -93,9 +93,14 @@ jobs:
           key: ${{ runner.os }}-go-build-cache-${{ hashFiles('**/go.sum') }}
 
       - name: Inject go-build-cache
-        uses: reproducible-containers/buildkit-cache-dance@4b2444fec0c0fb9dbf175a96c094720a692ef810 # v2.1.4
+        uses: reproducible-containers/buildkit-cache-dance@6f699a72a59e4252f05a7435430009b77e25fe06 # v3.3.1
         with:
-          cache-source: go-build-cache
+          cache-map: |
+            {
+              "go-build-cache/apk": "/var/cache/apk",
+              "go-build-cache/pkg": "/go/pkg/mod",
+              "go-build-cache/build": "/root/.cache/go-build"
+            }
 
       # Build and push Docker image with Buildx (don't push on PR)
       # https://github.com/docker/build-push-action

.github/workflows/lint.yml

@@ -23,8 +23,9 @@ jobs:
         run: script/build-ui
       - uses: actions/setup-go@v6
         with:
-          go-version: stable
+          go-version: '1.25'
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v9
         with:
-          version: v2.5
+          # sync with script/lint
+          version: v2.9

.golangci.yml

@@ -9,12 +9,14 @@ linters:
     - gosec
     - makezero
     - misspell
+    - modernize
     - nakedret
     - revive
     - errcheck
     - staticcheck
     - govet
     - ineffassign
+    - intrange
     - unused
   exclusions:
     generated: lax
@@ -27,6 +29,11 @@ linters:
       - third_party$
       - builtin$
       - examples$
+      - internal/githubv4mock
+    rules:
+      - linters:
+          - revive
+        text: "var-naming: avoid package names that conflict with Go standard library package names"
   settings:
     staticcheck:
       checks:

Dockerfile

@@ -7,7 +7,7 @@ COPY ui/ ./ui/
 RUN mkdir -p ./pkg/github/ui_dist && \
     cd ui && npm run build
 
-FROM golang:1.25.6-alpine AS build
+FROM golang:1.25.7-alpine AS build
 ARG VERSION="dev"
 
 # Set the working directory

cmd/github-mcp-server/generate_docs.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"net/url"
 	"os"
+	"slices"
 	"sort"
 	"strings"
 
@@ -234,7 +235,7 @@ func writeToolDoc(buf *strings.Builder, tool inventory.ServerTool) {
 
 		for i, propName := range paramNames {
 			prop := schema.Properties[propName]
-			required := contains(schema.Required, propName)
+			required := slices.Contains(schema.Required, propName)
 			requiredStr := "optional"
 			if required {
 				requiredStr = "required"
@@ -289,15 +290,6 @@ func scopesEqual(a, b []string) bool {
 	return true
 }
 
-func contains(slice []string, item string) bool {
-	for _, s := range slice {
-		if s == item {
-			return true
-		}
-	}
-	return false
-}
-
 // indentMultilineDescription adds the specified indent to all lines after the first line.
 // This ensures that multi-line descriptions maintain proper markdown list formatting.
 func indentMultilineDescription(description, indent string) string {
@@ -319,14 +311,14 @@ func replaceSection(content, startMarker, endMarker, newContent string) (string,
 	start := fmt.Sprintf("<!-- %s -->", startMarker)
 	end := fmt.Sprintf("<!-- %s -->", endMarker)
 
-	startIdx := strings.Index(content, start)
+	before, _, ok := strings.Cut(content, start)
 	endIdx := strings.Index(content, end)
-	if startIdx == -1 || endIdx == -1 {
+	if !ok || endIdx == -1 {
 		return "", fmt.Errorf("markers not found: %s / %s", start, end)
 	}
 
 	var buf strings.Builder
-	buf.WriteString(content[:startIdx])
+	buf.WriteString(before)
 	buf.WriteString(start)
 	buf.WriteString("\n")
 	buf.WriteString(newContent)
@@ -426,6 +418,7 @@ func generateRemoteOnlyToolsetsDoc() string {
 
 	return strings.TrimSuffix(buf.String(), "\n")
 }
+
 func generateDeprecatedAliasesDocs(docsPath string) error {
 	// Read the current file
 	content, err := os.ReadFile(docsPath) //#nosec G304

cmd/mcpcurl/main.go

@@ -73,8 +73,8 @@ type (
 
 	// RequestParams contains the tool name and arguments
 	RequestParams struct {
-		Name      string                 `json:"name"`
-		Arguments map[string]interface{} `json:"arguments"`
+		Name      string         `json:"name"`
+		Arguments map[string]any `json:"arguments"`
 	}
 
 	// Content matches the response format of a text content response
@@ -308,8 +308,8 @@ func addCommandFromTool(toolsCmd *cobra.Command, tool *Tool, prettyPrint bool) {
 }
 
 // buildArgumentsMap extracts flag values into a map of arguments
-func buildArgumentsMap(cmd *cobra.Command, tool *Tool) (map[string]interface{}, error) {
-	arguments := make(map[string]interface{})
+func buildArgumentsMap(cmd *cobra.Command, tool *Tool) (map[string]any, error) {
+	arguments := make(map[string]any)
 
 	for name, prop := range tool.InputSchema.Properties {
 		switch prop.Type {
@@ -340,7 +340,7 @@ func buildArgumentsMap(cmd *cobra.Command, tool *Tool) (map[string]interface{},
 					}
 				case "object":
 					if jsonStr, _ := cmd.Flags().GetString(name + "-json"); jsonStr != "" {
-						var jsonArray []interface{}
+						var jsonArray []any
 						if err := json.Unmarshal([]byte(jsonStr), &jsonArray); err != nil {
 							return nil, fmt.Errorf("error parsing JSON for %s: %w", name, err)
 						}
@@ -355,7 +355,7 @@ func buildArgumentsMap(cmd *cobra.Command, tool *Tool) (map[string]interface{},
 }
 
 // buildJSONRPCRequest creates a JSON-RPC request with the given tool name and arguments
-func buildJSONRPCRequest(method, toolName string, arguments map[string]interface{}) (string, error) {
+func buildJSONRPCRequest(method, toolName string, arguments map[string]any) (string, error) {
 	id, err := rand.Int(rand.Reader, big.NewInt(10000))
 	if err != nil {
 		return "", fmt.Errorf("failed to generate random ID: %w", err)
@@ -432,7 +432,7 @@ func printResponse(response string, prettyPrint bool) error {
 	// Extract text from content items of type "text"
 	for _, content := range resp.Result.Content {
 		if content.Type == "text" {
-			var textContentObj map[string]interface{}
+			var textContentObj map[string]any
 			err := json.Unmarshal([]byte(content.Text), &textContentObj)
 
 			if err == nil {
@@ -445,7 +445,7 @@ func printResponse(response string, prettyPrint bool) error {
 			}
 
 			// Fallback parsing as JSONL
-			var textContentList []map[string]interface{}
+			var textContentList []map[string]any
 			if err := json.Unmarshal([]byte(content.Text), &textContentList); err != nil {
 				return fmt.Errorf("failed to parse text content as a list: %w", err)
 			}

docs/installation-guides/install-copilot-cli.md

@@ -1,10 +1,48 @@
 # Install GitHub MCP Server in Copilot CLI
 
-## Prerequisites
+The GitHub MCP server comes pre-installed in Copilot CLI, with read-only tools enabled by default.
 
-1. Copilot CLI installed (see [official Copilot CLI documentation](https://docs.github.com/en/copilot/concepts/agents/about-copilot-cli))
-2. [GitHub Personal Access Token](https://github.com/settings/personal-access-tokens/new) with appropriate scopes
-3. For local installation: [Docker](https://www.docker.com/) installed and running
+## Built-in Server
+
+To verify the server is available, from an active Copilot CLI session:
+
+```bash
+/mcp show github-mcp-server
+```
+
+### Per-Session Customization
+
+Use CLI flags to customize the server for a session:
+
+```bash
+# Enable an additional toolset
+copilot --add-github-mcp-toolset discussions
+
+# Enable multiple additional toolsets
+copilot --add-github-mcp-toolset discussions --add-github-mcp-toolset stargazers
+
+# Enable all toolsets
+copilot --enable-all-github-mcp-tools
+
+# Enable a specific tool
+copilot --add-github-mcp-tool list_discussions
+
+# Disable the built-in server entirely
+copilot --disable-builtin-mcps
+```
+
+Run `copilot --help` for all available flags. For the list of toolsets, see [Available toolsets](../../README.md#available-toolsets); for the list of tools, see [Tools](../../README.md#tools).
+
+## Custom Configuration
+
+You can configure the GitHub MCP server in Copilot CLI using either the interactive command or by manually editing the configuration file.
+
+> **Server naming:** Name your server `github-mcp-server` to replace the built-in server, or use a different name (e.g., `github`) to run alongside it.
+
+### Prerequisites
+
+1. [GitHub Personal Access Token](https://github.com/settings/personal-access-tokens/new) with appropriate scopes
+2. For local server: [Docker](https://www.docker.com/) installed and running
 
 <details>
 <summary><b>Storing Your PAT Securely</b></summary>
@@ -19,21 +57,17 @@ export GITHUB_PERSONAL_ACCESS_TOKEN=your_token_here
 
 </details>
 
-## GitHub MCP Server Configuration
-
-You can configure the GitHub MCP server in Copilot CLI using either the interactive command or by manually editing the configuration file.
-
 ### Method 1: Interactive Setup (Recommended)
 
-Use the Copilot CLI to interactively add the MCP server:
+From an active Copilot CLI session, run the interactive command:
 
 ```bash
 /mcp add
 ```
 
-Follow the prompts to configure the GitHub MCP server.
+Follow the prompts to configure the server.
 
-### Method 2: Manual Configuration
+### Method 2: Manual Setup
 
 Create or edit the configuration file `~/.copilot/mcp-config.json` and add one of the following configurations:
 
@@ -45,6 +79,7 @@ Connect to the hosted MCP server:
 {
   "mcpServers": {
     "github": {
+      "type": "http",
       "url": "https://api.githubcopilot.com/mcp/",
       "headers": {
         "Authorization": "Bearer ${GITHUB_PERSONAL_ACCESS_TOKEN}"
@@ -54,6 +89,8 @@ Connect to the hosted MCP server:
 }
 ```
 
+For additional options like toolsets and read-only mode, see the [remote server documentation](../remote-server.md#optional-headers).
+
 #### Local Docker
 
 With Docker running, you can run the GitHub MCP server in a container:
@@ -81,9 +118,13 @@ With Docker running, you can run the GitHub MCP server in a container:
 
 #### Binary
 
-You can download the latest binary release from the [GitHub releases page](https://github.com/github/github-mcp-server/releases) or build it from source by running `go build -o github-mcp-server ./cmd/github-mcp-server`.
+You can download the latest binary release from the [GitHub releases page](https://github.com/github/github-mcp-server/releases) or build it from source by running:
 
-Then, replacing `/path/to/binary` with the actual path to your binary, configure Copilot CLI with:
+```bash
+go build -o github-mcp-server ./cmd/github-mcp-server
+```
+
+Then configure (replace `/path/to/binary` with the actual path):
 
 ```json
 {
@@ -101,35 +142,30 @@ Then, replacing `/path/to/binary` with the actual path to your binary, configure
 
 ## Verification
 
-To verify that the GitHub MCP server has been configured:
-
-1. Start or restart Copilot CLI
-2. The GitHub tools should be available for use in your conversations
+1. Restart Copilot CLI
+2. Run `/mcp show` to list configured servers
+3. Try: "List my GitHub repositories"
 
 ## Troubleshooting
 
 ### Local Server Issues
 
 - **Docker errors**: Ensure Docker Desktop is running
-    ```bash
-    docker --version
-    ```
 - **Image pull failures**: Try `docker logout ghcr.io` then retry
-- **Docker not found**: Install Docker Desktop and ensure it's running
 
 ### Authentication Issues
 
 - **Invalid PAT**: Verify your GitHub PAT has correct scopes:
-    - `repo` - Repository operations
-    - `read:packages` - Docker image access (if using Docker)
+  - `repo` - Repository operations
+  - `read:packages` - Docker image access (if using Docker)
 - **Token expired**: Generate a new GitHub PAT
 
 ### Configuration Issues
 
 - **Invalid JSON**: Validate your configuration:
-    ```bash
-    cat ~/.copilot/mcp-config.json | jq .
-    ```
+  ```bash
+  cat ~/.copilot/mcp-config.json | jq .
+  ```
 
 ## References
 

e2e/e2e_test.go

@@ -18,7 +18,7 @@ import (
 	"github.com/github/github-mcp-server/internal/ghmcp"
 	"github.com/github/github-mcp-server/pkg/github"
 	"github.com/github/github-mcp-server/pkg/translations"
-	gogithub "github.com/google/go-github/v79/github"
+	gogithub "github.com/google/go-github/v82/github"
 	"github.com/modelcontextprotocol/go-sdk/mcp"
 	"github.com/stretchr/testify/require"
 )