refactor(inventory): generalize tool availability guards

Gate protocol-restricted tools on required elicitation capabilities and enforce direct calls inside the registered handler so SDK result finalization remains intact.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Copilot-Session: 4b04480c-c2e9-483e-9b0f-34830b76a2f8

Author: SamMorrowDrums

pkg/github/repositories.go

@@ -814,6 +814,7 @@ func DeleteRepository(t translations.TranslationHelperFunc) inventory.ServerTool
 		},
 	)
 	tool.MinimumProtocolVersion = inventory.ProtocolVersionMultiRoundTrip
+	tool.RequiredElicitationMode = inventory.ElicitationModeForm
 	return tool
 }
 

pkg/github/repositories_test.go

@@ -3000,6 +3000,7 @@ func Test_DeleteRepository(t *testing.T) {
 	require.NotNil(t, tool.Annotations.DestructiveHint)
 	assert.True(t, *tool.Annotations.DestructiveHint)
 	assert.Equal(t, inventory.ProtocolVersionMultiRoundTrip, serverTool.MinimumProtocolVersion)
+	assert.Equal(t, inventory.ElicitationModeForm, serverTool.RequiredElicitationMode)
 	assert.Equal(t, []string{string(scopes.DeleteRepo)}, serverTool.RequiredScopes)
 
 	t.Run("requests exact repository name through elicitation", func(t *testing.T) {

pkg/http/handler_test.go

@@ -934,31 +934,53 @@ func TestHTTPToolMinimumProtocolVersion(t *testing.T) {
 	handler.RegisterRoutes(router)
 
 	for _, tt := range []struct {
-		name               string
-		protocolVersion    string
-		wantDeleteRepoTool bool
+		name                    string
+		protocolVersion         string
+		elicitationCapabilities map[string]any
+		wantDeleteRepoTool      bool
 	}{
 		{
-			name:               "current protocol includes delete repository",
-			protocolVersion:    inventory.ProtocolVersionMultiRoundTrip,
-			wantDeleteRepoTool: true,
+			name:                    "current protocol with form elicitation includes delete repository",
+			protocolVersion:         inventory.ProtocolVersionMultiRoundTrip,
+			elicitationCapabilities: map[string]any{"form": map[string]any{}},
+			wantDeleteRepoTool:      true,
 		},
 		{
-			name:               "legacy protocol hides delete repository",
-			protocolVersion:    "2025-11-25",
-			wantDeleteRepoTool: false,
+			name:                    "current protocol with URL-only elicitation hides delete repository",
+			protocolVersion:         inventory.ProtocolVersionMultiRoundTrip,
+			elicitationCapabilities: map[string]any{"url": map[string]any{}},
+		},
+		{
+			name:            "current protocol without elicitation hides delete repository",
+			protocolVersion: inventory.ProtocolVersionMultiRoundTrip,
+		},
+		{
+			name:                    "legacy protocol hides delete repository",
+			protocolVersion:         "2025-11-25",
+			elicitationCapabilities: map[string]any{"form": map[string]any{}},
 		},
 	} {
 		t.Run(tt.name, func(t *testing.T) {
-			body := strings.Replace(
-				`{"jsonrpc":"2.0","id":1,"method":"tools/list","params":{"_meta":{"io.modelcontextprotocol/protocolVersion":"PROTOCOL_VERSION","io.modelcontextprotocol/clientCapabilities":{"elicitation":{"form":{}}},"io.modelcontextprotocol/clientInfo":{"name":"test","version":"v0.0.1"}}}}`,
-				"PROTOCOL_VERSION",
-				tt.protocolVersion,
-				1,
-			)
-			req := httptest.NewRequest(http.MethodPost, "/", strings.NewReader(body))
+			clientCapabilities := map[string]any{}
+			if tt.elicitationCapabilities != nil {
+				clientCapabilities["elicitation"] = tt.elicitationCapabilities
+			}
+			body, err := json.Marshal(map[string]any{
+				"jsonrpc": "2.0",
+				"id":      1,
+				"method":  "tools/list",
+				"params": map[string]any{
+					"_meta": map[string]any{
+						mcp.MetaKeyProtocolVersion:    tt.protocolVersion,
+						mcp.MetaKeyClientCapabilities: clientCapabilities,
+						mcp.MetaKeyClientInfo:         map[string]any{"name": "test", "version": "v0.0.1"},
+					},
+				},
+			})
+			require.NoError(t, err)
+
+			req := httptest.NewRequest(http.MethodPost, "/", strings.NewReader(string(body)))
 			req.Header.Set(headers.ContentTypeHeader, headers.ContentTypeJSON)
-			req.Header.Set(headers.AuthorizationHeader, "Bearer test-token")
 			req.Header.Set(headers.AcceptHeader, strings.Join([]string{headers.ContentTypeJSON, headers.ContentTypeEventStream}, ", "))
 			req.Header.Set("Mcp-Protocol-Version", tt.protocolVersion)
 			req.Header.Set("Mcp-Method", "tools/list")

pkg/inventory/protocol_version.go

@@ -221,7 +221,7 @@ func shouldStripMCPAppsMetadata(ctx context.Context, featureFlagEnabled bool) bo
 // /insiders route.
 func (r *Inventory) RegisterTools(ctx context.Context, s *mcp.Server, deps any, middleware ...ToolHandlerMiddleware) {
 	tools := r.ToolsForRegistration(ctx)
-	addToolProtocolVersionMiddleware(s, tools)
+	addToolAvailabilityMiddleware(s, tools)
 	for _, tool := range tools {
 		tool.RegisterFunc(s, deps, middleware...)
 	}

pkg/inventory/protocol_version_test.go

@@ -85,6 +85,10 @@ type ServerTool struct {
 	// call this tool. Empty means the tool is available on every version.
 	MinimumProtocolVersion string
 
+	// RequiredElicitationMode is the elicitation mode the client must support to
+	// list or call this tool. Empty means the tool does not require elicitation.
+	RequiredElicitationMode ElicitationMode
+
 	// RequiredScopes specifies the minimum OAuth scopes required for this tool.
 	// These are the scopes that must be present for the tool to function.
 	RequiredScopes []string
@@ -123,6 +127,7 @@ func (st *ServerTool) RegisterFunc(s *mcp.Server, deps any, middleware ...ToolHa
 	for i := len(middleware) - 1; i >= 0; i-- {
 		handler = middleware[i](handler)
 	}
+	handler = st.wrapAvailabilityCheck(handler)
 	// Make a shallow copy of the tool to avoid mutating the original
 	toolCopy := st.Tool
 	// Apply icons from toolset metadata if tool doesn't have icons set