Add: mcpd config tools remove (#75)

* Add new command: mcpd config tools remove

* config env remove and config args remove have cleaner looking output

Author: peteski22

cmd/config/args/remove.go

@@ -72,6 +72,6 @@ func (c *RemoveCmd) run(cmd *cobra.Command, args []string) error {
 		}
 	}
 
-	fmt.Fprintf(cmd.OutOrStdout(), "✓ Args removed for server '%s': %v\n", serverName, argMap)
+	fmt.Fprintf(cmd.OutOrStdout(), "✓ Args removed for server '%s': %v\n", serverName, slices.Collect(maps.Keys(argMap)))
 	return nil
 }

cmd/config/config.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/mozilla-ai/mcpd/v2/cmd/config/args"
 	"github.com/mozilla-ai/mcpd/v2/cmd/config/env"
+	"github.com/mozilla-ai/mcpd/v2/cmd/config/tools"
 	"github.com/mozilla-ai/mcpd/v2/internal/cmd"
 	"github.com/mozilla-ai/mcpd/v2/internal/cmd/options"
 )
@@ -18,8 +19,9 @@ func NewConfigCmd(baseCmd *cmd.BaseCmd, opt ...options.CmdOption) (*cobra.Comman
 
 	// Sub-commands for: mcpd config
 	fns := []func(baseCmd *cmd.BaseCmd, opt ...options.CmdOption) (*cobra.Command, error){
-		args.NewCmd, // args
-		env.NewCmd,  // env
+		args.NewCmd,  // args
+		env.NewCmd,   // env
+		tools.NewCmd, // tools
 	}
 
 	for _, fn := range fns {

cmd/config/env/remove.go

@@ -2,6 +2,8 @@ package env
 
 import (
 	"fmt"
+	"maps"
+	"slices"
 	"strings"
 
 	"github.com/spf13/cobra"
@@ -65,6 +67,6 @@ func (c *RemoveCmd) run(cmd *cobra.Command, args []string) error {
 		}
 	}
 
-	fmt.Fprintf(cmd.OutOrStdout(), "✓ Environment variables removed for server '%s': %v\n", serverName, envMap)
+	fmt.Fprintf(cmd.OutOrStdout(), "✓ Environment variables removed for server '%s': %v\n", serverName, slices.Collect(maps.Keys(envMap)))
 	return nil
 }

cmd/config/env/set.go

@@ -2,6 +2,8 @@ package env
 
 import (
 	"fmt"
+	"maps"
+	"slices"
 	"strings"
 
 	"github.com/spf13/cobra"
@@ -71,6 +73,6 @@ func (c *SetCmd) run(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("failed to save config: %w", err)
 	}
 
-	fmt.Fprintf(cmd.OutOrStdout(), "✓ Environment variables set for server '%s': %v\n", serverName, envMap)
+	fmt.Fprintf(cmd.OutOrStdout(), "✓ Environment variables set for server '%s': %v\n", serverName, slices.Collect(maps.Keys(envMap)))
 	return nil
 }

cmd/config/tools/cmd.go

@@ -0,0 +1,38 @@
+package tools
+
+import (
+	"github.com/spf13/cobra"
+
+	"github.com/mozilla-ai/mcpd/v2/internal/cmd"
+	"github.com/mozilla-ai/mcpd/v2/internal/cmd/options"
+)
+
+type Cmd struct {
+	*cmd.BaseCmd
+}
+
+func NewCmd(baseCmd *cmd.BaseCmd, opt ...options.CmdOption) (*cobra.Command, error) {
+	cobraCmd := &cobra.Command{
+		Use:   "tools",
+		Short: "Manages tools configuration for a registered MCP server",
+		Long: "Manages tools configuration for a registered MCP server, " +
+			"dealing with setting, removing, and listing tools",
+	}
+
+	// Sub-commands for: mcpd config env
+	fns := []func(baseCmd *cmd.BaseCmd, opt ...options.CmdOption) (*cobra.Command, error){
+		// NewSetCmd,    // set
+		NewRemoveCmd, // remove
+		// NewListCmd,   // list
+	}
+
+	for _, fn := range fns {
+		tempCmd, err := fn(baseCmd, opt...)
+		if err != nil {
+			return nil, err
+		}
+		cobraCmd.AddCommand(tempCmd)
+	}
+
+	return cobraCmd, nil
+}

cmd/config/tools/remove.go

@@ -0,0 +1,104 @@
+package tools
+
+import (
+	"fmt"
+	"maps"
+	"slices"
+	"strings"
+
+	"github.com/spf13/cobra"
+
+	"github.com/mozilla-ai/mcpd/v2/internal/cmd"
+	cmdopts "github.com/mozilla-ai/mcpd/v2/internal/cmd/options"
+	"github.com/mozilla-ai/mcpd/v2/internal/config"
+	"github.com/mozilla-ai/mcpd/v2/internal/flags"
+)
+
+type RemoveCmd struct {
+	*cmd.BaseCmd
+	cfgLoader config.Loader
+	Tools     []string
+}
+
+func NewRemoveCmd(baseCmd *cmd.BaseCmd, opt ...cmdopts.CmdOption) (*cobra.Command, error) {
+	opts, err := cmdopts.NewOptions(opt...)
+	if err != nil {
+		return nil, err
+	}
+
+	c := &RemoveCmd{
+		BaseCmd:   baseCmd,
+		cfgLoader: opts.ConfigLoader,
+	}
+
+	// mcpd config tools remove time TOOL [TOOL ...]
+	cobraCmd := &cobra.Command{
+		Use:   "remove <server-name> TOOL [TOOL ...]",
+		Short: "Remove allowed-listed tools for an MCP server from configuration",
+		Long: "Remove allowed-listed tools for an MCP server from configuration, " +
+			"if the specified tools are present in config they will be removed",
+		RunE: c.run,
+		Args: cobra.MinimumNArgs(2), // server-name + TOOL ...
+	}
+
+	return cobraCmd, nil
+}
+
+func (c *RemoveCmd) run(cmd *cobra.Command, args []string) error {
+	serverName := strings.TrimSpace(args[0])
+	if serverName == "" {
+		return fmt.Errorf("server-name is required")
+	}
+
+	tools := args[1:]
+	toolsMap := make(map[string]struct{}, len(tools))
+	for _, key := range tools {
+		key = strings.TrimSpace(key)
+		toolsMap[key] = struct{}{}
+	}
+
+	cfg, err := c.cfgLoader.Load(flags.ConfigFile)
+	if err != nil {
+		return err
+	}
+
+	for _, srv := range cfg.ListServers() {
+		if srv.Name != serverName {
+			continue
+		}
+
+		removed := map[string]struct{}{}
+
+		for k := range toolsMap {
+			if idx := slices.Index(srv.Tools, k); idx >= 0 {
+				srv.Tools = slices.Delete(srv.Tools, idx, idx+1)
+				removed[k] = struct{}{}
+			}
+		}
+
+		// Update server in config by removing and re-adding.
+		err = cfg.RemoveServer(serverName)
+		if err != nil {
+			return fmt.Errorf("error removing server, unable to remove tools for server %s: %w", serverName, err)
+		}
+
+		err = cfg.AddServer(srv)
+		if err != nil {
+			return fmt.Errorf("error adding server, unable to remove tools for server %s: %w", serverName, err)
+		}
+
+		msg := "✓ Command completed successfully, no tools required removal\n"
+		if len(removed) > 0 {
+			msg = fmt.Sprintf("✓ Tools removed for server '%s': %v\n", serverName, slices.Collect(maps.Keys(removed)))
+		}
+
+		_, err = fmt.Fprintf(cmd.OutOrStdout(), msg)
+		if err != nil {
+			return err
+		}
+
+		break
+	}
+
+	return nil
+}