multiple tools support

Author: Daniel-Kolev

cmd/docker-mcp/commands/tools.go

@@ -61,26 +61,26 @@ func toolsCommand(docker docker.Client) *cobra.Command {
 
 	var enableServerName string
 	enableCmd := &cobra.Command{
-		Use:   "enable",
-		Short: "enable a tool",
-		Args:  cobra.ExactArgs(1),
+		Use:   "enable [tool1] [tool2] ...",
+		Short: "enable one or more tools",
+		Args:  cobra.MinimumNArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return tools.Enable(cmd.Context(), docker, args, enableServerName)
 		},
 	}
-	enableCmd.Flags().StringVar(&enableServerName, "server", "", "Specify which server provides the tool (optional, will auto-discover if not provided)")
+	enableCmd.Flags().StringVar(&enableServerName, "server", "", "Specify which server provides the tools (optional, will auto-discover if not provided)")
 	cmd.AddCommand(enableCmd)
 
 	var disableServerName string
 	disableCmd := &cobra.Command{
-		Use:   "disable",
-		Short: "disable a tool",
-		Args:  cobra.ExactArgs(1),
+		Use:   "disable [tool1] [tool2] ...",
+		Short: "disable one or more tools",
+		Args:  cobra.MinimumNArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return tools.Disable(cmd.Context(), docker, args, disableServerName)
 		},
 	}
-	disableCmd.Flags().StringVar(&disableServerName, "server", "", "Specify which server provides the tool (optional, will auto-discover if not provided)")
+	disableCmd.Flags().StringVar(&disableServerName, "server", "", "Specify which server provides the tools (optional, will auto-discover if not provided)")
 	cmd.AddCommand(disableCmd)
 
 	return cmd

cmd/docker-mcp/tools/tools_test.go

@@ -158,6 +158,22 @@ func TestEnableToolAutoDiscoverNotFound(t *testing.T) {
 	require.ErrorContains(t, err, "tool \"nonexistent_tool\" not found in any server")
 }
 
+func TestEnableMultipleTools(t *testing.T) {
+	ctx, _, docker := setup(t, withEmptyToolsConfig(), withSampleCatalog())
+
+	err := Enable(ctx, docker, []string{"search_duckduckgo", "other_tool"}, "duckduckgo")
+	require.NoError(t, err)
+
+	toolsYAML, err := config.ReadTools(ctx, docker)
+	require.NoError(t, err)
+	toolsConfig, err := config.ParseToolsConfig(toolsYAML)
+	require.NoError(t, err)
+
+	assert.Contains(t, toolsConfig.ServerTools["duckduckgo"], "search_duckduckgo")
+	assert.Contains(t, toolsConfig.ServerTools["duckduckgo"], "other_tool")
+	assert.Len(t, toolsConfig.ServerTools["duckduckgo"], 2)
+}
+
 func TestDisableEmpty(t *testing.T) {
 	ctx, _, docker := setup(t, withEmptyToolsConfig(), withSampleCatalog())
 
@@ -214,6 +230,24 @@ func TestDisableServerNotFound(t *testing.T) {
 	require.ErrorContains(t, err, "server \"nonexistent_server\" not found in catalog")
 }
 
+func TestDisableMultipleTools(t *testing.T) {
+	ctx, _, docker := setup(t,
+		withToolsConfig("duckduckgo:\n  - search_duckduckgo\n  - other_tool"),
+		withSampleCatalog())
+
+	err := Disable(ctx, docker, []string{"search_duckduckgo", "other_tool"}, "duckduckgo")
+	require.NoError(t, err)
+
+	toolsYAML, err := config.ReadTools(ctx, docker)
+	require.NoError(t, err)
+	toolsConfig, err := config.ParseToolsConfig(toolsYAML)
+	require.NoError(t, err)
+
+	assert.NotContains(t, toolsConfig.ServerTools["duckduckgo"], "search_duckduckgo")
+	assert.NotContains(t, toolsConfig.ServerTools["duckduckgo"], "other_tool")
+	assert.Empty(t, toolsConfig.ServerTools["duckduckgo"])
+}
+
 // Fixtures and helpers
 
 func setup(t *testing.T, options ...option) (context.Context, string, docker.Client) {