Move MCP config from .mcp.json to .github/mcp.json (#26665)

Copilot · web-flow · commit 6ec285a1634c · 2026-04-16T09:02:48.000-07:00
diff --git a/.mcp.json b/.mcp.json
diff --git a/create.md b/create.md
@@ -132,7 +132,7 @@ You do not need to run `gh aw init` as part of your workflow creation. However i
 
 - `.github/agents/agentic-workflows.agent.md`
 - `.vscode/settings.json`
-- `.mcp.json`
+- `.github/mcp.json`
 - And several other configuration files
 
 Don't remove these but don't add them if not already present in the repo. Unless instructed otherwise do NOT commit the changes to ANY files except the gitattributes file and workflow files.
diff --git a/docs/src/content/docs/reference/gh-aw-as-mcp-server.md b/docs/src/content/docs/reference/gh-aw-as-mcp-server.md
@@ -66,9 +66,9 @@ Configure VS Code Copilot Chat to use gh-aw MCP server:
 gh aw init
 ```
 
-This creates `.mcp.json` and `.github/workflows/copilot-setup-steps.yml`. MCP server integration is enabled by default. Use `gh aw init --no-mcp` to skip MCP configuration.
+This creates `.github/mcp.json` and `.github/workflows/copilot-setup-steps.yml`. MCP server integration is enabled by default. Use `gh aw init --no-mcp` to skip MCP configuration.
 
-Alternatively, create `.mcp.json` manually:
+Alternatively, create `.github/mcp.json` manually:
 
 ```json wrap
 {
diff --git a/docs/src/content/docs/troubleshooting/errors.md b/docs/src/content/docs/troubleshooting/errors.md
@@ -204,7 +204,7 @@ Use `gh aw init my-workflow --force` to overwrite.
 
 `failed to parse existing mcp.json: [details]`
 
-Fix the JSON syntax (validate with `cat .mcp.json | jq .`) or delete the file to regenerate.
+Fix the JSON syntax (validate with `cat .github/mcp.json | jq .`) or delete the file to regenerate.
 
 ### Failed to Marshal MCP Config
 
diff --git a/install.md b/install.md
@@ -45,7 +45,7 @@ gh aw init
 - Configures `.gitattributes` to mark `.lock.yml` files as generated
 - Creates `.github/agents/agentic-workflows.agent.md` as the dispatcher agent for AI workflows
 - Configures VSCode settings in `.vscode/settings.json`
-- Creates GH-AW MCP server configuration in `.mcp.json`
+- Creates GH-AW MCP server configuration in `.github/mcp.json`
 - Creates `.github/workflows/copilot-setup-steps.yml` with setup instructions
 
 **Note**: The command may prompt for additional configuration or secrets. If secrets are needed, `gh aw init` will provide instructions for setting them up. You don't need to configure secrets as part of this initial setup.
@@ -63,7 +63,7 @@ You should see new/modified files including:
 - `.gitattributes`
 - `.github/agents/agentic-workflows.agent.md`
 - `.vscode/settings.json`
-- `.mcp.json`
+- `.github/mcp.json`
 
 Commit the initialization changes:
 
diff --git a/pkg/cli/init.go b/pkg/cli/init.go
@@ -92,13 +92,13 @@ func InitRepository(opts InitOptions) error {
 			fmt.Fprintln(os.Stderr, console.FormatSuccessMessage("Created .github/workflows/copilot-setup-steps.yml"))
 		}
 
-		// Create .mcp.json
+		// Create .github/mcp.json
 		if err := ensureMCPConfig(opts.Verbose); err != nil {
 			initLog.Printf("Failed to create MCP config: %v", err)
 			return fmt.Errorf("failed to create MCP config: %w", err)
 		}
 		if opts.Verbose {
-			fmt.Fprintln(os.Stderr, console.FormatSuccessMessage("Created .mcp.json"))
+			fmt.Fprintln(os.Stderr, console.FormatSuccessMessage("Created .github/mcp.json"))
 		}
 	}
 
diff --git a/pkg/cli/init_command.go b/pkg/cli/init_command.go
@@ -35,7 +35,7 @@ This command:
 
 By default (without --no-mcp):
 - Creates .github/workflows/copilot-setup-steps.yml with gh-aw installation steps
-- Creates .mcp.json with gh-aw MCP server configuration
+- Creates .github/mcp.json with gh-aw MCP server configuration
 
 With --no-mcp flag:
 - Skips creating GitHub Copilot Agent MCP server configuration files
diff --git a/pkg/cli/init_command_test.go b/pkg/cli/init_command_test.go
@@ -188,7 +188,7 @@ func TestInitRepositoryBasic(t *testing.T) {
 	// Verify MCP files were created by default
 	mcpConfigPath := mcpConfigFilePath
 	if _, err := os.Stat(mcpConfigPath); os.IsNotExist(err) {
-		t.Error("Expected .mcp.json to be created by default")
+		t.Error("Expected .github/mcp.json to be created by default")
 	}
 
 	setupStepsPath := filepath.Join(".github", "workflows", "copilot-setup-steps.yml")
@@ -227,10 +227,10 @@ func TestInitRepositoryWithMCP(t *testing.T) {
 		t.Fatalf("InitRepository(, false, false, false, nil) with MCP failed: %v", err)
 	}
 
-	// Verify .mcp.json was created
+	// Verify .github/mcp.json was created
 	mcpConfigPath := mcpConfigFilePath
 	if _, err := os.Stat(mcpConfigPath); os.IsNotExist(err) {
-		t.Error("Expected .mcp.json to be created")
+		t.Error("Expected .github/mcp.json to be created")
 	}
 
 	// Verify copilot-setup-steps.yml was created
@@ -270,10 +270,10 @@ func TestInitRepositoryWithNoMCP(t *testing.T) {
 		t.Fatalf("InitRepository(, false, false, false, nil) with --no-mcp failed: %v", err)
 	}
 
-	// Verify .mcp.json was NOT created
+	// Verify .github/mcp.json was NOT created
 	mcpConfigPath := mcpConfigFilePath
 	if _, err := os.Stat(mcpConfigPath); err == nil {
-		t.Error("Expected .mcp.json to NOT be created with --no-mcp flag")
+		t.Error("Expected .github/mcp.json to NOT be created with --no-mcp flag")
 	}
 
 	// Verify copilot-setup-steps.yml was NOT created
@@ -318,10 +318,10 @@ func TestInitRepositoryWithMCPBackwardCompatibility(t *testing.T) {
 		t.Fatalf("InitRepository(, false, false, false, nil) with deprecated --mcp flag failed: %v", err)
 	}
 
-	// Verify .mcp.json was created
+	// Verify .github/mcp.json was created
 	mcpConfigPath := mcpConfigFilePath
 	if _, err := os.Stat(mcpConfigPath); os.IsNotExist(err) {
-		t.Error("Expected .mcp.json to be created with --mcp flag (backward compatibility)")
+		t.Error("Expected .github/mcp.json to be created with --mcp flag (backward compatibility)")
 	}
 
 	// Verify copilot-setup-steps.yml was created
@@ -481,7 +481,7 @@ func TestInitRepositoryWithMCPIdempotent(t *testing.T) {
 	// Verify files still exist and are correct
 	mcpConfigPath := mcpConfigFilePath
 	if _, err := os.Stat(mcpConfigPath); os.IsNotExist(err) {
-		t.Error("Expected .mcp.json to still exist after second run")
+		t.Error("Expected .github/mcp.json to still exist after second run")
 	}
 
 	setupStepsPath := filepath.Join(".github", "workflows", "copilot-setup-steps.yml")
diff --git a/pkg/cli/init_mcp_test.go b/pkg/cli/init_mcp_test.go
@@ -77,24 +77,24 @@ func TestInitRepository_WithMCP(t *testing.T) {
 		}
 	}
 
-	// Verify .mcp.json was created
+	// Verify .github/mcp.json was created
 	mcpConfigPath := filepath.Join(tempDir, mcpConfigFilePath)
 	if _, err := os.Stat(mcpConfigPath); os.IsNotExist(err) {
-		t.Errorf("Expected .mcp.json to exist")
+		t.Errorf("Expected .github/mcp.json to exist")
 	} else {
 		// Verify content is valid JSON with gh-aw server
 		content, err := os.ReadFile(mcpConfigPath)
 		if err != nil {
-			t.Fatalf("Failed to read .mcp.json: %v", err)
+			t.Fatalf("Failed to read .github/mcp.json: %v", err)
 		}
 
 		var config MCPConfig
 		if err := json.Unmarshal(content, &config); err != nil {
-			t.Fatalf("Failed to parse .mcp.json: %v", err)
+			t.Fatalf("Failed to parse .github/mcp.json: %v", err)
 		}
 
 		if _, exists := config.MCPServers["github-agentic-workflows"]; !exists {
-			t.Errorf("Expected .mcp.json to contain github-agentic-workflows server")
+			t.Errorf("Expected .github/mcp.json to contain github-agentic-workflows server")
 		}
 
 		server := config.MCPServers["github-agentic-workflows"]
@@ -155,7 +155,7 @@ func TestInitRepository_MCP_Idempotent(t *testing.T) {
 
 	mcpConfigPath := filepath.Join(tempDir, mcpConfigFilePath)
 	if _, err := os.Stat(mcpConfigPath); os.IsNotExist(err) {
-		t.Errorf("Expected .mcp.json to exist after second call")
+		t.Errorf("Expected .github/mcp.json to exist after second call")
 	}
 }
 
@@ -176,7 +176,7 @@ func TestEnsureMCPConfig_RendersInstructions(t *testing.T) {
 		t.Fatalf("Failed to change directory: %v", err)
 	}
 
-	// Create initial .mcp.json with a different server
+	// Create initial .github/mcp.json with a different server
 	initialConfig := MCPConfig{
 		MCPServers: map[string]VSCodeMCPServer{
 			"other-server": {
@@ -187,8 +187,11 @@ func TestEnsureMCPConfig_RendersInstructions(t *testing.T) {
 	}
 	initialData, _ := json.MarshalIndent(initialConfig, "", "  ")
 	mcpConfigPath := filepath.Join(tempDir, mcpConfigFilePath)
+	if err := os.MkdirAll(filepath.Dir(mcpConfigPath), 0755); err != nil {
+		t.Fatalf("Failed to create MCP config directory: %v", err)
+	}
 	if err := os.WriteFile(mcpConfigPath, initialData, 0644); err != nil {
-		t.Fatalf("Failed to write initial .mcp.json: %v", err)
+		t.Fatalf("Failed to write initial .github/mcp.json: %v", err)
 	}
 
 	// Call ensureMCPConfig
@@ -199,12 +202,12 @@ func TestEnsureMCPConfig_RendersInstructions(t *testing.T) {
 	// Verify the config was NOT modified (file should remain unchanged)
 	content, err := os.ReadFile(mcpConfigPath)
 	if err != nil {
-		t.Fatalf("Failed to read .mcp.json: %v", err)
+		t.Fatalf("Failed to read .github/mcp.json: %v", err)
 	}
 
 	var config MCPConfig
 	if err := json.Unmarshal(content, &config); err != nil {
-		t.Fatalf("Failed to parse .mcp.json: %v", err)
+		t.Fatalf("Failed to parse .github/mcp.json: %v", err)
 	}
 
 	// Check that other-server still exists
diff --git a/pkg/cli/mcp_config_file.go b/pkg/cli/mcp_config_file.go
@@ -4,15 +4,15 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
+	"path/filepath"
 
 	"github.com/github/gh-aw/pkg/logger"
 )
 
 var mcpConfigLog = logger.New("cli:mcp_config_file")
 
 // mcpConfigFilePath is the path to the MCP configuration file used by GitHub Copilot CLI.
-// GitHub Copilot CLI reads .mcp.json from the repository root.
-const mcpConfigFilePath = ".mcp.json"
+const mcpConfigFilePath = ".github/mcp.json"
 
 // VSCodeMCPServer represents a single MCP server configuration for VSCode mcp.json
 type VSCodeMCPServer struct {
@@ -21,17 +21,17 @@ type VSCodeMCPServer struct {
 	CWD     string   `json:"cwd,omitempty"`
 }
 
-// MCPConfig represents the structure of .mcp.json for Claude Code.
+// MCPConfig represents the structure of .github/mcp.json for Claude Code.
 type MCPConfig struct {
 	MCPServers map[string]VSCodeMCPServer `json:"mcpServers,omitempty"`
-	// Servers is a legacy key kept for backward-compatible reads of existing .mcp.json files.
+	// Servers is a legacy key kept for backward-compatible reads of existing mcp config files.
 	Servers map[string]VSCodeMCPServer `json:"servers,omitempty"`
 }
 
-// ensureMCPConfig creates .mcp.json with gh-aw MCP server configuration
+// ensureMCPConfig creates .github/mcp.json with gh-aw MCP server configuration
 // If the file already exists, it renders console instructions instead of editing
 func ensureMCPConfig(verbose bool) error {
-	mcpConfigLog.Print("Creating .mcp.json")
+	mcpConfigLog.Print("Creating .github/mcp.json")
 
 	mcpConfigPath := mcpConfigFilePath
 
@@ -78,6 +78,10 @@ func ensureMCPConfig(verbose bool) error {
 	}
 	config.MCPServers[ghAwServerName] = ghAwConfig
 
+	if err := os.MkdirAll(filepath.Dir(mcpConfigPath), 0755); err != nil {
+		return fmt.Errorf("failed to create mcp config directory: %w", err)
+	}
+
 	// Write config file with proper indentation
 	data, err := json.MarshalIndent(config, "", "  ")
 	if err != nil {
@@ -92,15 +96,15 @@ func ensureMCPConfig(verbose bool) error {
 	return nil
 }
 
-// renderMCPConfigUpdateInstructions renders console instructions for updating .mcp.json
+// renderMCPConfigUpdateInstructions renders console instructions for updating .github/mcp.json
 func renderMCPConfigUpdateInstructions(filePath, serverName string, serverConfig VSCodeMCPServer) {
 	fmt.Fprintln(os.Stderr)
 	fmt.Fprintf(os.Stderr, "%s %s\n",
 		"ℹ",
 		"Existing file detected: "+filePath)
 	fmt.Fprintln(os.Stderr)
 	fmt.Fprintln(os.Stderr, "To enable GitHub Copilot Agent MCP server integration, please add the following")
-	fmt.Fprintln(os.Stderr, "to the \"mcpServers\" section of your .mcp.json file:")
+	fmt.Fprintf(os.Stderr, "to the \"mcpServers\" section of your %s file:\n", filePath)
 	fmt.Fprintln(os.Stderr)
 
 	// Generate the JSON to add
diff --git a/pkg/cli/mcp_config_file_test.go b/pkg/cli/mcp_config_file_test.go
@@ -5,6 +5,7 @@ package cli
 import (
 	"encoding/json"
 	"os"
+	"path/filepath"
 	"testing"
 
 	"github.com/github/gh-aw/pkg/testutil"
@@ -134,6 +135,9 @@ func TestEnsureMCPConfig(t *testing.T) {
 					t.Fatalf("Failed to marshal existing config: %v", err)
 				}
 
+				if err := os.MkdirAll(filepath.Dir(mcpConfigFilePath), 0755); err != nil {
+					t.Fatalf("Failed to create mcp config directory: %v", err)
+				}
 				if err := os.WriteFile(mcpConfigFilePath, data, 0644); err != nil {
 					t.Fatalf("Failed to write existing config: %v", err)
 				}
@@ -154,7 +158,7 @@ func TestEnsureMCPConfig(t *testing.T) {
 
 			// Verify the file was created
 			if _, err := os.Stat(mcpConfigFilePath); os.IsNotExist(err) {
-				t.Error("Expected .mcp.json to exist")
+				t.Error("Expected .github/mcp.json to exist")
 				return
 			}
 
@@ -326,15 +330,15 @@ func TestEnsureMCPConfigDirectoryCreation(t *testing.T) {
 		t.Fatalf("Failed to change to temp directory: %v", err)
 	}
 
-	// Call function when .mcp.json doesn't exist
+	// Call function when .github/mcp.json doesn't exist
 	err = ensureMCPConfig(false)
 	if err != nil {
 		t.Fatalf("ensureMCPConfig() failed: %v", err)
 	}
 
-	// Verify .mcp.json was created
+	// Verify .github/mcp.json was created
 	if _, err := os.Stat(mcpConfigFilePath); os.IsNotExist(err) {
-		t.Error("Expected .mcp.json to be created")
+		t.Error("Expected .github/mcp.json to be created")
 	}
 }
 
@@ -361,7 +365,7 @@ func TestMCPConfigFilePermissions(t *testing.T) {
 	// Check file permissions
 	info, err := os.Stat(mcpConfigFilePath)
 	if err != nil {
-		t.Fatalf("Failed to stat .mcp.json: %v", err)
+		t.Fatalf("Failed to stat .github/mcp.json: %v", err)
 	}
 
 	// Verify file is readable and writable (at minimum)
diff --git a/pkg/workflow/compiler_yaml_main_job.go b/pkg/workflow/compiler_yaml_main_job.go
@@ -326,7 +326,7 @@ func (c *Compiler) generateMainJobSteps(yaml *strings.Builder, data *WorkflowDat
 	// Restore agent config folders from the base branch snapshot in the activation artifact.
 	// The activation job saved these before the PR checkout ran, so this step overwrites any
 	// PR-branch-injected files (e.g. forked skill/instruction files) with trusted base content.
-	// The .mcp.json at the workspace root is also removed since it may come from the PR branch.
+	// The .github/mcp.json file is also removed since it may come from the PR branch.
 	// The folder and file lists match those used in the save step (derived from engine registry).
 	if ShouldGeneratePRCheckoutStep(data) {
 		registry := GetGlobalEngineRegistry()
diff --git a/pkg/workflow/pr.go b/pkg/workflow/pr.go
@@ -37,7 +37,7 @@ func generateSaveBaseGitHubFoldersStep(folders, files []string) []string {
 // generateRestoreBaseGitHubFoldersStep generates a step (for the agent job) that restores
 // agent config from the activation artifact after checkout_pr_branch.cjs has run.
 // This prevents fork PRs from injecting malicious skill or instruction files.
-// The step also removes .mcp.json and only runs when the PR checkout step succeeded.
+// The step also removes .github/mcp.json and only runs when the PR checkout step succeeded.
 //
 // folders: the agent config directories to restore (must match save step)
 // files:   the root instruction files to restore (must match save step)

Original file line number	Diff line number	Diff line change
`@@ -66,9 +66,9 @@ Configure VS Code Copilot Chat to use gh-aw MCP server:`
`66`	`66`	`gh aw init`
`67`	`67`	```
`68`	`68`
`69`		-This creates `.mcp.json` and `.github/workflows/copilot-setup-steps.yml`. MCP server integration is enabled by default. Use `gh aw init --no-mcp` to skip MCP configuration.
	`69`	+This creates `.github/mcp.json` and `.github/workflows/copilot-setup-steps.yml`. MCP server integration is enabled by default. Use `gh aw init --no-mcp` to skip MCP configuration.
`70`	`70`
`71`		-Alternatively, create `.mcp.json` manually:
	`71`	+Alternatively, create `.github/mcp.json` manually:
`72`	`72`
`73`	`73`	```json wrap
`74`	`74`	`{`
Original file line number	Diff line number	Diff line change
`@@ -92,13 +92,13 @@ func InitRepository(opts InitOptions) error {`
`92`	`92`	`fmt.Fprintln(os.Stderr, console.FormatSuccessMessage("Created .github/workflows/copilot-setup-steps.yml"))`
`93`	`93`	`}`
`94`	`94`
`95`		`- // Create .mcp.json`
	`95`	`+ // Create .github/mcp.json`
`96`	`96`	`if err := ensureMCPConfig(opts.Verbose); err != nil {`
`97`	`97`	`initLog.Printf("Failed to create MCP config: %v", err)`
`98`	`98`	`return fmt.Errorf("failed to create MCP config: %w", err)`
`99`	`99`	`}`
`100`	`100`	`if opts.Verbose {`
`101`		`- fmt.Fprintln(os.Stderr, console.FormatSuccessMessage("Created .mcp.json"))`
	`101`	`+ fmt.Fprintln(os.Stderr, console.FormatSuccessMessage("Created .github/mcp.json"))`
`102`	`102`	`}`
`103`	`103`	`}`
`104`	`104`
Original file line number	Diff line number	Diff line change
`@@ -77,24 +77,24 @@ func TestInitRepository_WithMCP(t *testing.T) {`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`
`80`		`- // Verify .mcp.json was created`
	`80`	`+ // Verify .github/mcp.json was created`
`81`	`81`	`mcpConfigPath := filepath.Join(tempDir, mcpConfigFilePath)`
`82`	`82`	`if _, err := os.Stat(mcpConfigPath); os.IsNotExist(err) {`
`83`		`- t.Errorf("Expected .mcp.json to exist")`
	`83`	`+ t.Errorf("Expected .github/mcp.json to exist")`
`84`	`84`	`} else {`
`85`	`85`	`// Verify content is valid JSON with gh-aw server`
`86`	`86`	`content, err := os.ReadFile(mcpConfigPath)`
`87`	`87`	`if err != nil {`
`88`		`- t.Fatalf("Failed to read .mcp.json: %v", err)`
	`88`	`+ t.Fatalf("Failed to read .github/mcp.json: %v", err)`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`var config MCPConfig`
`92`	`92`	`if err := json.Unmarshal(content, &config); err != nil {`
`93`		`- t.Fatalf("Failed to parse .mcp.json: %v", err)`
	`93`	`+ t.Fatalf("Failed to parse .github/mcp.json: %v", err)`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`if _, exists := config.MCPServers["github-agentic-workflows"]; !exists {`
`97`		`- t.Errorf("Expected .mcp.json to contain github-agentic-workflows server")`
	`97`	`+ t.Errorf("Expected .github/mcp.json to contain github-agentic-workflows server")`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`server := config.MCPServers["github-agentic-workflows"]`
`@@ -155,7 +155,7 @@ func TestInitRepository_MCP_Idempotent(t *testing.T) {`
`155`	`155`
`156`	`156`	`mcpConfigPath := filepath.Join(tempDir, mcpConfigFilePath)`
`157`	`157`	`if _, err := os.Stat(mcpConfigPath); os.IsNotExist(err) {`
`158`		`- t.Errorf("Expected .mcp.json to exist after second call")`
	`158`	`+ t.Errorf("Expected .github/mcp.json to exist after second call")`
`159`	`159`	`}`
`160`	`160`	`}`
`161`	`161`
`@@ -176,7 +176,7 @@ func TestEnsureMCPConfig_RendersInstructions(t *testing.T) {`
`176`	`176`	`t.Fatalf("Failed to change directory: %v", err)`
`177`	`177`	`}`
`178`	`178`
`179`		`- // Create initial .mcp.json with a different server`
	`179`	`+ // Create initial .github/mcp.json with a different server`
`180`	`180`	`initialConfig := MCPConfig{`
`181`	`181`	`MCPServers: map[string]VSCodeMCPServer{`
`182`	`182`	`"other-server": {`
`@@ -187,8 +187,11 @@ func TestEnsureMCPConfig_RendersInstructions(t *testing.T) {`
`187`	`187`	`}`
`188`	`188`	`initialData, _ := json.MarshalIndent(initialConfig, "", " ")`
`189`	`189`	`mcpConfigPath := filepath.Join(tempDir, mcpConfigFilePath)`
	`190`	`+ if err := os.MkdirAll(filepath.Dir(mcpConfigPath), 0755); err != nil {`
	`191`	`+ t.Fatalf("Failed to create MCP config directory: %v", err)`
	`192`	`+ }`
`190`	`193`	`if err := os.WriteFile(mcpConfigPath, initialData, 0644); err != nil {`
`191`		`- t.Fatalf("Failed to write initial .mcp.json: %v", err)`
	`194`	`+ t.Fatalf("Failed to write initial .github/mcp.json: %v", err)`
`192`	`195`	`}`
`193`	`196`
`194`	`197`	`// Call ensureMCPConfig`
`@@ -199,12 +202,12 @@ func TestEnsureMCPConfig_RendersInstructions(t *testing.T) {`
`199`	`202`	`// Verify the config was NOT modified (file should remain unchanged)`
`200`	`203`	`content, err := os.ReadFile(mcpConfigPath)`
`201`	`204`	`if err != nil {`
`202`		`- t.Fatalf("Failed to read .mcp.json: %v", err)`
	`205`	`+ t.Fatalf("Failed to read .github/mcp.json: %v", err)`
`203`	`206`	`}`
`204`	`207`
`205`	`208`	`var config MCPConfig`
`206`	`209`	`if err := json.Unmarshal(content, &config); err != nil {`
`207`		`- t.Fatalf("Failed to parse .mcp.json: %v", err)`
	`210`	`+ t.Fatalf("Failed to parse .github/mcp.json: %v", err)`
`208`	`211`	`}`
`209`	`212`
`210`	`213`	`// Check that other-server still exists`