fixup! cli: add --use-env-proxy

Author: joyeecheung

doc/api/cli.md

@@ -3012,6 +3012,7 @@ environment variables during startup, and tunnels requests over the
 specified proxy.
 
 This is equivalent to setting the [`NODE_USE_ENV_PROXY=1`][] environment variable.
+When both are set, `--use-env-proxy` or `--no-use-env-proxy` takes precedence.
 
 ### `--use-largepages=mode`
 
@@ -3669,9 +3670,7 @@ environment variables during startup, and tunnels requests over the
 specified proxy.
 
 This can also be enabled using the [`--use-env-proxy`][] command-line flag.
-
-This currently only affects requests sent over `fetch()`. Support for other
-built-in `http` and `https` methods is under way.
+When both are set, `--use-env-proxy` or `--no-use-env-proxy` takes precedence.
 
 ### `NODE_V8_COVERAGE=dir`
 

lib/internal/process/pre_execution.js

@@ -181,9 +181,9 @@ function setupHttpProxy() {
   // For fetch, we need to set the global dispatcher from here.
   // For http/https agents, we'll configure the global agent when they are
   // actually created, in lib/_http_agent.js and lib/https.js.
-  // TODO(joyeecheung): This is currently guarded with NODE_USE_ENV_PROXY. Investigate whether
-  // it's possible to enable it by default without stepping on other existing libraries that
-  // sets the global dispatcher or monkey patches the global agent.
+  // TODO(joyeecheung): This is currently guarded with NODE_USE_ENV_PROXY and --use-env-proxy.
+  // Investigate whether it's possible to enable it by default without stepping on other
+  // existing libraries that sets the global dispatcher or monkey patches the global agent.
 }
 
 function setupUserModules(forceDefaultLoader = false) {