Merge branch 'main' into almaleksia/fix-oci-config

Author: almaleksia

docs/installation-guides/install-claude.md

@@ -28,15 +28,25 @@ echo -e ".env\n.mcp.json" >> .gitignore
 
 ### Remote Server Setup (Streamable HTTP)
 
+> **Note**: For Claude Code versions **2.1.1 and newer**, use the `add-json` command format below. For older versions, see the [legacy command format](#for-older-versions-of-claude-code).
+
 1. Run the following command in the terminal (not in Claude Code CLI):
 ```bash
-claude mcp add --transport http github https://api.githubcopilot.com/mcp -H "Authorization: Bearer YOUR_GITHUB_PAT"
+claude mcp add-json github '{"type":"http","url":"https://api.githubcopilot.com/mcp","headers":{"Authorization":"Bearer YOUR_GITHUB_PAT"}}'
 ```
 
 With an environment variable:
 ```bash
-claude mcp add --transport http github https://api.githubcopilot.com/mcp -H "Authorization: Bearer $(grep GITHUB_PAT .env | cut -d '=' -f2)"
+claude mcp add-json github '{"type":"http","url":"https://api.githubcopilot.com/mcp","headers":{"Authorization":"Bearer '"$(grep GITHUB_PAT .env | cut -d '=' -f2)"'"}}'
 ```
+
+> **About the `--scope` flag** (optional): Use this to specify where the configuration is stored:
+> - `local` (default): Available only to you in the current project (was called `project` in older versions)
+> - `project`: Shared with everyone in the project via `.mcp.json` file
+> - `user`: Available to you across all projects (was called `global` in older versions)
+>
+> Example: Add `--scope user` to the end of the command to make it available across all projects.
+
 2. Restart Claude Code
 3. Run `claude mcp list` to see if the GitHub server is configured
 
@@ -72,6 +82,19 @@ claude mcp list
 claude mcp get github
 ```
 
+### For Older Versions of Claude Code
+
+If you're using Claude Code version **2.1.0 or earlier**, use this legacy command format:
+
+```bash
+claude mcp add --transport http github https://api.githubcopilot.com/mcp -H "Authorization: Bearer YOUR_GITHUB_PAT"
+```
+
+With an environment variable:
+```bash
+claude mcp add --transport http github https://api.githubcopilot.com/mcp -H "Authorization: Bearer $(grep GITHUB_PAT .env | cut -d '=' -f2)"
+```
+
 ---
 
 ## Claude Desktop
@@ -161,7 +184,4 @@ Add this codeblock to your `claude_desktop_config.json`:
 
 - The npm package `@modelcontextprotocol/server-github` is deprecated as of April 2025
 - Remote server requires Streamable HTTP support (check your Claude version)
-- Configuration scopes for Claude Code:
-  - `-s user`: Available across all projects
-  - `-s project`: Shared via `.mcp.json` file
-  - Default: `local` (current project only)
+- For Claude Code configuration scopes, see the `--scope` flag documentation in the [Remote Server Setup](#remote-server-setup-streamable-http) section

pkg/inventory/builder.go

@@ -149,11 +149,14 @@ func (b *Builder) Build() *Inventory {
 	if len(b.additionalTools) > 0 {
 		r.additionalTools = make(map[string]bool, len(b.additionalTools))
 		for _, name := range b.additionalTools {
-			// Resolve deprecated aliases to canonical names
+			// Always include the original name - this handles the case where
+			// the tool exists but is controlled by a feature flag that's OFF.
+			r.additionalTools[name] = true
+			// Also include the canonical name if this is a deprecated alias.
+			// This handles the case where the feature flag is ON and only
+			// the new consolidated tool is available.
 			if canonical, isAlias := b.deprecatedAliases[name]; isAlias {
 				r.additionalTools[canonical] = true
-			} else {
-				r.additionalTools[name] = true
 			}
 		}
 	}

pkg/inventory/registry_test.go

@@ -1688,3 +1688,57 @@ func TestForMCPRequest_ToolsCall_FeatureFlaggedVariants(t *testing.T) {
 			availableOn[0].FeatureFlagEnable, availableOn[0].FeatureFlagDisable)
 	}
 }
+
+// TestWithTools_DeprecatedAliasAndFeatureFlag tests that deprecated aliases work correctly
+// when the old tool is controlled by a feature flag. This covers the scenario where:
+// - Old tool "old_tool" has FeatureFlagDisable="my_flag" (available when flag is OFF)
+// - New tool "new_tool" has FeatureFlagEnable="my_flag" (available when flag is ON)
+// - Deprecated alias maps "old_tool" -> "new_tool"
+// - User specifies --tools=old_tool
+// Expected behavior:
+// - Flag OFF: old_tool should be available (not the new_tool via alias)
+// - Flag ON: new_tool should be available (via alias resolution)
+func TestWithTools_DeprecatedAliasAndFeatureFlag(t *testing.T) {
+	oldTool := mockToolWithFlags("old_tool", "actions", true, "", "my_flag")
+	newTool := mockToolWithFlags("new_tool", "actions", true, "my_flag", "")
+	tools := []ServerTool{oldTool, newTool}
+
+	deprecatedAliases := map[string]string{
+		"old_tool": "new_tool",
+	}
+
+	// Test 1: Flag OFF - old_tool should be available via direct name match
+	// (not via alias resolution to new_tool, since old_tool still exists)
+	regFlagOff := NewBuilder().
+		SetTools(tools).
+		WithDeprecatedAliases(deprecatedAliases).
+		WithToolsets([]string{}).        // No toolsets enabled
+		WithTools([]string{"old_tool"}). // Explicitly request old tool
+		Build()
+	availableOff := regFlagOff.AvailableTools(context.Background())
+	if len(availableOff) != 1 {
+		t.Fatalf("Flag OFF: Expected 1 tool, got %d", len(availableOff))
+	}
+	if availableOff[0].Tool.Name != "old_tool" {
+		t.Errorf("Flag OFF: Expected old_tool, got %s", availableOff[0].Tool.Name)
+	}
+
+	// Test 2: Flag ON - new_tool should be available via alias resolution
+	checker := func(_ context.Context, flag string) (bool, error) {
+		return flag == "my_flag", nil
+	}
+	regFlagOn := NewBuilder().
+		SetTools(tools).
+		WithDeprecatedAliases(deprecatedAliases).
+		WithToolsets([]string{}).        // No toolsets enabled
+		WithTools([]string{"old_tool"}). // Request old tool name
+		WithFeatureChecker(checker).
+		Build()
+	availableOn := regFlagOn.AvailableTools(context.Background())
+	if len(availableOn) != 1 {
+		t.Fatalf("Flag ON: Expected 1 tool, got %d", len(availableOn))
+	}
+	if availableOn[0].Tool.Name != "new_tool" {
+		t.Errorf("Flag ON: Expected new_tool (via alias), got %s", availableOn[0].Tool.Name)
+	}
+}