f929c58c6b
* Add CSV output for list tools under insiders mode * fix: resolve rebase feature flag conflicts Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Simplify feature-flag handling: collapse CSV dual-variant + skip filtering when no checker (#2516) * refactor: generic toolset+name sort, clarify feature flag intent Address review feedback on #2450: - Collapse the three near-identical sort helpers in pkg/inventory/filters.go into a generic sortByToolsetThenName so adding new inventory item types doesn't require copying the comparator. - Expand the doc comments on the three *WithoutFeatureFiltering helpers to spell out why they exist: HTTP mode builds a static (process-wide) inventory as an upper bound, but per-request feature flags from headers (X-MCP-Features, X-MCP-Insiders) are evaluated later, so feature-flagged variants must be preserved here. - Strengthen the doc comment on ResolveFeatureFlags to make the contract explicit: user-supplied flags are validated against AllowedFeatureFlags, but insiders expansion deliberately is not — InsidersFeatureFlags may include server-controlled flags that are not user-toggleable. CORS comments are intentionally left for the PR author. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * docs(feature-flags): clarify allowed and insiders sets are independent Also add tests covering: - a user-toggleable flag (FeatureFlagIssuesGranular) that insiders does not turn on automatically - insiders mode not turning on user-only allowed flags Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * refactor(inventory): collapse three *WithoutFeatureFiltering helpers into StaticUpperBound The three parallel methods (AvailableToolsWithoutFeatureFiltering, AvailableResourceTemplatesWithoutFeatureFiltering, AvailablePromptsWithoutFeatureFiltering) were always called as a triple in exactly two places: HTTP buildStaticInventory and its test mirror. They exist because the dual-variant pattern (sibling tools with mirrored FeatureFlagEnable / FeatureFlagDisable on the same name, e.g. CSV output) makes feature filtering at static-build time impossible — both variants must be kept and resolved per-request. Replace the three with one method, Inventory.StaticUpperBound(ctx), that returns (tools, resources, prompts) and carries the rationale in its doc comment. Reduces API surface, eliminates the triplication, and makes the single "skip feature filtering" concept obvious to readers. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * refactor: simplify feature-flag handling Two related simplifications, both about treating insiders as a meta flag that expands once at startup and then stops mattering: - Collapse CSV's dual-variant pattern into a single tool whose handler performs a runtime feature-flag check via deps.IsFeatureEnabled. CSV is a pure response-format toggle, not a schema change, so it does not need the dual-name pattern that genuine schema variants (granular issues/PRs) still use. - When no feature checker is installed, skip feature-flag filtering and return the full upper bound. The static HTTP inventory now uses plain AvailableTools/Resources/Prompts; the per-request inventory always installs a checker, so MCP registration (which serves a tool name once) always sees a deduplicated set. The bespoke StaticUpperBound helper and the isToolEnabledWithFeatureFlags split go away. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * ci(mcp-diff): add insiders + per-feature configs The mcp-diff matrix now includes: - --insiders (and --insiders --read-only) - one config per github.AllowedFeatureFlags entry, generated by script/print-mcp-diff-configs so new user-controllable flags get diffed automatically without editing the workflow Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * docs(insiders): explain feature-flag resolution for contributors Adds a 'How feature flags are resolved' section covering: - Insiders is a meta flag, like 'all'/'default' for toolsets - User input -> allowlist filter -> insiders expansion -> server-side fallback (remote only) - AllowedFeatureFlags vs InsidersFeatureFlags are independent - How to add a new feature flag, including the TestGitHubPackageDoesNotReadInsidersMode guard Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * refactor(inventory): make feature-flag gating a regular ToolFilter Move tool feature-flag evaluation out of isToolEnabled and into a ToolFilter installed at the head of the pipeline by Build() when WithFeatureChecker received a non-nil checker. The 'no checker = no filtering' contract is now expressed structurally (the filter isn't installed) instead of by a runtime nil check inside the helper. Resources and prompts have no filter pipeline, so they call the now-pure featureFlagAllowed helper behind an explicit r.featureChecker != nil guard at the iteration site. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * perf(inventory): cache extracted toolset IDs in sort comparator Avoid evaluating the extractor closures up to three times per comparison. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix: correct MCP features header in cors * docs: regenerate README for CSV output toolset Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix: remove duplicate MCPFeaturesHeader from CORS headers * ci(mcp-diff): add streamable-http job with header-based configs Adds a sibling mcp-diff-http job that exercises the streamable-http transport against a shared HTTP server, with per-config settings supplied via X-MCP-* request headers — mirroring how the remote server is invoked in production (server-side defaults + per-user header overrides). The config generator gains a -transport flag: - stdio (default, unchanged behaviour) - http-headers (emits headers-only configs targeting a shared server) Two new combined entries layer multiple headers together as a smoke test for header-merging regressions. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * docs: regenerate after merging main Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: Sam Morrow <info@sam-morrow.com> Co-authored-by: sammorrowdrums <sammorrowdrums@github.com>
220 lines
6.4 KiB
Go
220 lines
6.4 KiB
Go
package github
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"testing"
|
|
|
|
"github.com/github/github-mcp-server/pkg/translations"
|
|
"github.com/modelcontextprotocol/go-sdk/mcp"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/github/github-mcp-server/pkg/inventory"
|
|
"github.com/github/github-mcp-server/pkg/scopes"
|
|
"github.com/github/github-mcp-server/pkg/utils"
|
|
)
|
|
|
|
// RemoteMCPEnthusiasticGreeting is a dummy test feature flag .
|
|
const RemoteMCPEnthusiasticGreeting = "remote_mcp_enthusiastic_greeting"
|
|
|
|
func featureCheckerFor(enabledFlags ...string) func(context.Context, string) (bool, error) {
|
|
enabled := make(map[string]bool, len(enabledFlags))
|
|
for _, flag := range enabledFlags {
|
|
enabled[flag] = true
|
|
}
|
|
return func(_ context.Context, flagName string) (bool, error) {
|
|
return enabled[flagName], nil
|
|
}
|
|
}
|
|
|
|
// HelloWorld returns a simple greeting tool that demonstrates feature flag conditional behavior.
|
|
// This tool is for testing and demonstration purposes only.
|
|
func HelloWorldTool(t translations.TranslationHelperFunc) inventory.ServerTool {
|
|
return NewTool(
|
|
ToolsetMetadataContext, // Use existing "context" toolset
|
|
mcp.Tool{
|
|
Name: "hello_world",
|
|
Description: t("TOOL_HELLO_WORLD_DESCRIPTION", "A simple greeting tool that demonstrates feature flag conditional behavior"),
|
|
Annotations: &mcp.ToolAnnotations{
|
|
Title: t("TOOL_HELLO_WORLD_TITLE", "Hello World"),
|
|
ReadOnlyHint: true,
|
|
},
|
|
},
|
|
[]scopes.Scope{},
|
|
func(ctx context.Context, deps ToolDependencies, _ *mcp.CallToolRequest, _ map[string]any) (*mcp.CallToolResult, any, error) {
|
|
|
|
// Check feature flag to determine greeting style
|
|
greeting := "Hello, world!"
|
|
if deps.IsFeatureEnabled(ctx, RemoteMCPEnthusiasticGreeting) {
|
|
greeting += " Welcome to the future of MCP! 🎉"
|
|
}
|
|
|
|
// Build response
|
|
response := map[string]any{
|
|
"greeting": greeting,
|
|
}
|
|
|
|
jsonBytes, err := json.Marshal(response)
|
|
if err != nil {
|
|
return utils.NewToolResultError("failed to marshal response"), nil, nil
|
|
}
|
|
|
|
return utils.NewToolResultText(string(jsonBytes)), nil, nil
|
|
},
|
|
)
|
|
}
|
|
|
|
func TestHelloWorld_ConditionalBehavior_Featureflag(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
tests := []struct {
|
|
name string
|
|
featureFlagEnabled bool
|
|
inputName string
|
|
expectedGreeting string
|
|
}{
|
|
{
|
|
name: "Feature flag disabled - default greeting",
|
|
featureFlagEnabled: false,
|
|
expectedGreeting: "Hello, world!",
|
|
},
|
|
{
|
|
name: "Feature flag enabled - enthusiastic greeting",
|
|
featureFlagEnabled: true,
|
|
expectedGreeting: "Hello, world! Welcome to the future of MCP! 🎉",
|
|
},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
var enabledFlags []string
|
|
if tt.featureFlagEnabled {
|
|
enabledFlags = append(enabledFlags, RemoteMCPEnthusiasticGreeting)
|
|
}
|
|
|
|
// Create deps with the checker
|
|
deps := NewBaseDeps(
|
|
nil, nil, nil, nil,
|
|
translations.NullTranslationHelper,
|
|
FeatureFlags{},
|
|
0,
|
|
featureCheckerFor(enabledFlags...),
|
|
stubExporters(),
|
|
)
|
|
|
|
// Get the tool and its handler
|
|
tool := HelloWorldTool(translations.NullTranslationHelper)
|
|
handler := tool.Handler(deps)
|
|
|
|
// Call the handler with deps in context
|
|
ctx := ContextWithDeps(context.Background(), deps)
|
|
result, err := handler(ctx, &mcp.CallToolRequest{
|
|
Params: &mcp.CallToolParamsRaw{
|
|
Arguments: json.RawMessage(`{}`),
|
|
},
|
|
})
|
|
require.NoError(t, err)
|
|
require.NotNil(t, result)
|
|
require.Len(t, result.Content, 1)
|
|
|
|
// Parse the response - should be TextContent
|
|
textContent, ok := result.Content[0].(*mcp.TextContent)
|
|
require.True(t, ok, "expected content to be TextContent")
|
|
|
|
var response map[string]any
|
|
err = json.Unmarshal([]byte(textContent.Text), &response)
|
|
require.NoError(t, err)
|
|
|
|
// Verify the greeting matches expected based on feature flag
|
|
assert.Equal(t, tt.expectedGreeting, response["greeting"])
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestResolveFeatureFlags(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
tests := []struct {
|
|
name string
|
|
enabledFeatures []string
|
|
insidersMode bool
|
|
expectedFlags []string
|
|
unexpectedFlags []string
|
|
}{
|
|
{
|
|
name: "no features, no insiders",
|
|
enabledFeatures: nil,
|
|
expectedFlags: nil,
|
|
unexpectedFlags: []string{MCPAppsFeatureFlag, FeatureFlagIFCLabels},
|
|
},
|
|
{
|
|
name: "explicit feature enabled",
|
|
enabledFeatures: []string{MCPAppsFeatureFlag},
|
|
expectedFlags: []string{MCPAppsFeatureFlag},
|
|
},
|
|
{
|
|
name: "insiders mode enables insiders flags",
|
|
enabledFeatures: nil,
|
|
insidersMode: true,
|
|
expectedFlags: InsidersFeatureFlags,
|
|
},
|
|
{
|
|
name: "insiders mode enables internal-only flags",
|
|
enabledFeatures: nil,
|
|
insidersMode: true,
|
|
expectedFlags: []string{FeatureFlagIFCLabels},
|
|
},
|
|
{
|
|
name: "internal-only flags are not directly enabled",
|
|
enabledFeatures: []string{FeatureFlagIFCLabels},
|
|
expectedFlags: nil,
|
|
unexpectedFlags: []string{FeatureFlagIFCLabels},
|
|
},
|
|
{
|
|
name: "unknown flags are filtered out",
|
|
enabledFeatures: []string{"unknown_flag", "another_unknown"},
|
|
unexpectedFlags: []string{"unknown_flag", "another_unknown"},
|
|
},
|
|
{
|
|
name: "mix of known and unknown flags",
|
|
enabledFeatures: []string{MCPAppsFeatureFlag, "unknown_flag"},
|
|
expectedFlags: []string{MCPAppsFeatureFlag},
|
|
unexpectedFlags: []string{"unknown_flag"},
|
|
},
|
|
{
|
|
name: "user-only flags can be enabled but are not turned on by insiders",
|
|
enabledFeatures: []string{FeatureFlagIssuesGranular},
|
|
insidersMode: false,
|
|
expectedFlags: []string{FeatureFlagIssuesGranular},
|
|
},
|
|
{
|
|
name: "insiders does not enable user-only allowed flags",
|
|
enabledFeatures: nil,
|
|
insidersMode: true,
|
|
unexpectedFlags: []string{FeatureFlagIssuesGranular, FeatureFlagPullRequestsGranular},
|
|
},
|
|
{
|
|
name: "explicit plus insiders deduplicates",
|
|
enabledFeatures: []string{MCPAppsFeatureFlag},
|
|
insidersMode: true,
|
|
expectedFlags: InsidersFeatureFlags,
|
|
},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
t.Parallel()
|
|
result := ResolveFeatureFlags(tt.enabledFeatures, tt.insidersMode)
|
|
for _, flag := range tt.expectedFlags {
|
|
assert.True(t, result[flag], "expected flag %q to be enabled", flag)
|
|
}
|
|
for _, flag := range tt.unexpectedFlags {
|
|
assert.False(t, result[flag], "expected flag %q to not be enabled", flag)
|
|
}
|
|
})
|
|
}
|
|
}
|