remove disable_toolset_prompts flag and openshift flag

Signed-off-by: Nader Ziada <[email protected]>

Author: nader-ziada

README.md

@@ -311,7 +311,7 @@ role = "user"
 content = "Help me with {{resource_name}}"
 ```
 
-2. Toolset prompts implemented by toolset developers (can be disabled with disable_toolset_prompts = true)
+2. Toolset prompts implemented by toolset developers
 
 See docs/PROMPTS.md for detailed documentation.
 

docs/PROMPTS.md

@@ -68,7 +68,7 @@ Toolsets can provide built-in prompts by implementing the `GetPrompts()` method.
 ### Implementing Toolset Prompts
 
 ```go
-func (t *MyToolset) GetPrompts(o internalk8s.Openshift) []api.ServerPrompt {
+func (t *MyToolset) GetPrompts() []api.ServerPrompt {
     return []api.ServerPrompt{
         {
             Prompt: api.Prompt{
@@ -104,18 +104,6 @@ func (t *MyToolset) GetPrompts(o internalk8s.Openshift) []api.ServerPrompt {
 }
 ```
 
-### Disabling Toolset Prompts
-
-Add `disable_toolset_prompts = true` in your `config.toml` to use only config-defined prompts:
-
-```toml
-disable_toolset_prompts = true
-
-[[prompts]]
-name = "my-custom-prompt"
-# ... rest of config
-```
-
 ### Prompt Merging
 
 When both toolset and config prompts exist:

pkg/api/toolsets.go

@@ -45,7 +45,7 @@ type Toolset interface {
 	GetTools(o Openshift) []ServerTool
 	// GetPrompts returns the prompts provided by this toolset.
 	// Returns nil if the toolset doesn't provide any prompts.
-	GetPrompts(o Openshift) []ServerPrompt
+	GetPrompts() []ServerPrompt
 }
 
 type ToolCallRequest interface {

pkg/config/config.go

@@ -81,9 +81,6 @@ type StaticConfig struct {
 	promptsDefined  bool           // Internal: tracks if prompts were defined in config
 	promptsMetadata toml.MetaData  // Internal: metadata for prompts decoding
 
-	// When true, disable toolset-defined prompts (only use config-defined prompts)
-	DisableToolsetPrompts bool `toml:"disable_toolset_prompts,omitempty"`
-
 	// Server instructions to be provided by the MCP server to the MCP client
 	// This can be used to provide specific instructions on how the client should use the server
 	ServerInstructions string `toml:"server_instructions,omitempty"`

pkg/mcp/mcp.go

@@ -171,17 +171,15 @@ func (s *Server) reloadToolsets() error {
 	applicablePrompts := make([]api.ServerPrompt, 0)
 	s.enabledPrompts = make([]string, 0)
 
-	// Load embedded toolset prompts (unless disabled)
-	if !s.configuration.DisableToolsetPrompts {
-		for _, toolset := range s.configuration.Toolsets() {
-			prompts := toolset.GetPrompts(s.p)
-			if prompts == nil {
-				continue
-			}
-			for _, prompt := range prompts {
-				applicablePrompts = append(applicablePrompts, prompt)
-				s.enabledPrompts = append(s.enabledPrompts, prompt.Prompt.Name)
-			}
+	// Load embedded toolset prompts
+	for _, toolset := range s.configuration.Toolsets() {
+		prompts := toolset.GetPrompts()
+		if prompts == nil {
+			continue
+		}
+		for _, prompt := range prompts {
+			applicablePrompts = append(applicablePrompts, prompt)
+			s.enabledPrompts = append(s.enabledPrompts, prompt.Prompt.Name)
 		}
 	}
 

pkg/mcp/mcp_toolset_prompts_test.go

@@ -363,67 +363,6 @@ func (s *McpToolsetPromptsSuite) TestPromptsNotExposedWhenToolsetDisabled() {
 	})
 }
 
-func (s *McpToolsetPromptsSuite) TestDisableToolsetPromptsConfig() {
-	testToolset := &mockToolsetWithPrompts{
-		name:        "test-toolset",
-		description: "Test toolset",
-		prompts: []api.ServerPrompt{
-			{
-				Prompt: api.Prompt{
-					Name:        "toolset-prompt",
-					Description: "Should be disabled",
-				},
-				Handler: func(params api.PromptHandlerParams) (*api.PromptCallResult, error) {
-					return api.NewPromptCallResult("Toolset", []api.PromptMessage{}, nil), nil
-				},
-			},
-		},
-	}
-
-	toolsets.Clear()
-	toolsets.Register(testToolset)
-
-	// Add config prompt
-	cfg, err := config.ReadToml([]byte(`
-toolsets = ["test-toolset"]
-disable_toolset_prompts = true
-
-[[prompts]]
-name = "config-prompt"
-description = "Config prompt only"
-
-[[prompts.messages]]
-role = "user"
-content = "From config"
-	`))
-	s.Require().NoError(err)
-	// Preserve kubeconfig from SetupTest
-	cfg.KubeConfig = s.Cfg.KubeConfig
-	s.Cfg = cfg
-
-	s.InitMcpClient()
-
-	prompts, err := s.ListPrompts(s.T().Context(), mcp.ListPromptsRequest{})
-
-	s.Run("ListPrompts returns prompts", func() {
-		s.NoError(err)
-		s.Require().NotNil(prompts)
-	})
-
-	s.Run("only config prompts are available", func() {
-		s.Require().NotNil(prompts)
-		s.Require().Len(prompts.Prompts, 1)
-		s.Equal("config-prompt", prompts.Prompts[0].Name)
-	})
-
-	s.Run("toolset prompts are not available when disabled", func() {
-		s.Require().NotNil(prompts)
-		for _, prompt := range prompts.Prompts {
-			s.NotEqual("toolset-prompt", prompt.Name)
-		}
-	})
-}
-
 // Mock toolset for testing
 type mockToolsetWithPrompts struct {
 	name        string
@@ -443,7 +382,7 @@ func (m *mockToolsetWithPrompts) GetTools(_ api.Openshift) []api.ServerTool {
 	return nil
 }
 
-func (m *mockToolsetWithPrompts) GetPrompts(_ api.Openshift) []api.ServerPrompt {
+func (m *mockToolsetWithPrompts) GetPrompts() []api.ServerPrompt {
 	return m.prompts
 }
 

pkg/toolsets/config/toolset.go

@@ -25,7 +25,7 @@ func (t *Toolset) GetTools(_ api.Openshift) []api.ServerTool {
 	)
 }
 
-func (t *Toolset) GetPrompts(_ api.Openshift) []api.ServerPrompt {
+func (t *Toolset) GetPrompts() []api.ServerPrompt {
 	// Config toolset does not provide prompts
 	return nil
 }

pkg/toolsets/core/toolset.go

@@ -29,7 +29,7 @@ func (t *Toolset) GetTools(o api.Openshift) []api.ServerTool {
 	)
 }
 
-func (t *Toolset) GetPrompts(_ api.Openshift) []api.ServerPrompt {
+func (t *Toolset) GetPrompts() []api.ServerPrompt {
 	// Core toolset prompts will be added in Feature 3
 	return nil
 }

pkg/toolsets/helm/toolset.go

@@ -25,7 +25,7 @@ func (t *Toolset) GetTools(_ api.Openshift) []api.ServerTool {
 	)
 }
 
-func (t *Toolset) GetPrompts(_ api.Openshift) []api.ServerPrompt {
+func (t *Toolset) GetPrompts() []api.ServerPrompt {
 	// Helm toolset does not provide prompts
 	return nil
 }

pkg/toolsets/kiali/toolset.go

@@ -32,7 +32,7 @@ func (t *Toolset) GetTools(_ api.Openshift) []api.ServerTool {
 	)
 }
 
-func (t *Toolset) GetPrompts(_ api.Openshift) []api.ServerPrompt {
+func (t *Toolset) GetPrompts() []api.ServerPrompt {
 	// Kiali toolset does not provide prompts
 	return nil
 }