fix(cli): stop injecting -c config for oxlint/oxfmt

oxlint 1.60.0 and oxfmt 0.45.0 auto-discover the nearest
vite.config.ts from cwd up (gated by VP_VERSION, which vp injects via
merge_resolved_envs_with_version and the bin wrappers). Injecting
`-c <root vite.config.ts>` broke the nested-workspace case: running
`vp lint` / `vp fmt` from a sub-package applied the root config
instead of the sub-package's own config.

Drop the -c injection from the Lint/Fmt resolver arms and propagate
the now-unused resolved_vite_config parameter removal through
resolve_and_execute, resolve_and_capture_output, and their callers.
resolve_universal_vite_config() stays for check/mod.rs's
LintMessageKind derivation.

Snapshot updates:
- nested-oxc-config-proj-1: both vp lint and vp fmt --check pass when
  run from packages/proj-1 (regression test for oxc-project/oxc#20416).
- workspace-lint-subpackage: sub-package's no-console:off now wins
  over root's no-console:warn as documented.

Closes oxc-project/oxc#20416

Author: fengmk2

packages/cli/binding/src/check/mod.rs

@@ -54,7 +54,6 @@ pub(crate) async fn execute_check(
         let captured = resolve_and_capture_output(
             resolver,
             SynthesizableSubcommand::Fmt { args },
-            Some(&resolved_vite_config),
             envs,
             cwd,
             cwd_arc,
@@ -133,7 +132,6 @@ pub(crate) async fn execute_check(
         let captured = resolve_and_capture_output(
             resolver,
             SynthesizableSubcommand::Lint { args },
-            Some(&resolved_vite_config),
             envs,
             cwd,
             cwd_arc,
@@ -200,7 +198,6 @@ pub(crate) async fn execute_check(
         let captured = resolve_and_capture_output(
             resolver,
             SynthesizableSubcommand::Fmt { args },
-            Some(&resolved_vite_config),
             envs,
             cwd,
             cwd_arc,

packages/cli/binding/src/cli/execution.rs

@@ -7,22 +7,19 @@ use vite_task::ExitStatus;
 
 use super::{
     resolver::SubcommandResolver,
-    types::{CapturedCommandOutput, ResolvedUniversalViteConfig, SynthesizableSubcommand},
+    types::{CapturedCommandOutput, SynthesizableSubcommand},
 };
 
 /// Resolve a subcommand into a prepared `tokio::process::Command`.
 async fn resolve_and_build_command(
     resolver: &SubcommandResolver,
     subcommand: SynthesizableSubcommand,
-    resolved_vite_config: Option<&ResolvedUniversalViteConfig>,
     envs: &Arc<FxHashMap<Arc<OsStr>, Arc<OsStr>>>,
     cwd: &AbsolutePathBuf,
     cwd_arc: &Arc<AbsolutePath>,
 ) -> Result<tokio::process::Command, Error> {
-    let resolved = resolver
-        .resolve(subcommand, resolved_vite_config, envs, cwd_arc)
-        .await
-        .map_err(|e| Error::Anyhow(e))?;
+    let resolved =
+        resolver.resolve(subcommand, envs, cwd_arc).await.map_err(|e| Error::Anyhow(e))?;
 
     // Resolve the program path using `which` to handle Windows .cmd/.bat files (PATHEXT)
     let program_path = {
@@ -52,14 +49,11 @@ async fn resolve_and_build_command(
 pub(super) async fn resolve_and_execute(
     resolver: &SubcommandResolver,
     subcommand: SynthesizableSubcommand,
-    resolved_vite_config: Option<&ResolvedUniversalViteConfig>,
     envs: &Arc<FxHashMap<Arc<OsStr>, Arc<OsStr>>>,
     cwd: &AbsolutePathBuf,
     cwd_arc: &Arc<AbsolutePath>,
 ) -> Result<ExitStatus, Error> {
-    let mut cmd =
-        resolve_and_build_command(resolver, subcommand, resolved_vite_config, envs, cwd, cwd_arc)
-            .await?;
+    let mut cmd = resolve_and_build_command(resolver, subcommand, envs, cwd, cwd_arc).await?;
     let mut child = cmd.spawn().map_err(|e| Error::Anyhow(e.into()))?;
     let status = child.wait().await.map_err(|e| Error::Anyhow(e.into()))?;
     Ok(ExitStatus(status.code().unwrap_or(1) as u8))
@@ -75,16 +69,13 @@ pub(super) enum FilterStream {
 pub(super) async fn resolve_and_execute_with_filter(
     resolver: &SubcommandResolver,
     subcommand: SynthesizableSubcommand,
-    resolved_vite_config: Option<&ResolvedUniversalViteConfig>,
     envs: &Arc<FxHashMap<Arc<OsStr>, Arc<OsStr>>>,
     cwd: &AbsolutePathBuf,
     cwd_arc: &Arc<AbsolutePath>,
     stream: FilterStream,
     filter: impl Fn(&str) -> Cow<'_, str>,
 ) -> Result<ExitStatus, Error> {
-    let mut cmd =
-        resolve_and_build_command(resolver, subcommand, resolved_vite_config, envs, cwd, cwd_arc)
-            .await?;
+    let mut cmd = resolve_and_build_command(resolver, subcommand, envs, cwd, cwd_arc).await?;
     match stream {
         FilterStream::Stdout => cmd.stdout(Stdio::piped()),
         FilterStream::Stderr => cmd.stderr(Stdio::piped()),
@@ -111,15 +102,12 @@ pub(super) async fn resolve_and_execute_with_filter(
 pub(crate) async fn resolve_and_capture_output(
     resolver: &SubcommandResolver,
     subcommand: SynthesizableSubcommand,
-    resolved_vite_config: Option<&ResolvedUniversalViteConfig>,
     envs: &Arc<FxHashMap<Arc<OsStr>, Arc<OsStr>>>,
     cwd: &AbsolutePathBuf,
     cwd_arc: &Arc<AbsolutePath>,
     force_color_if_terminal: bool,
 ) -> Result<CapturedCommandOutput, Error> {
-    let mut cmd =
-        resolve_and_build_command(resolver, subcommand, resolved_vite_config, envs, cwd, cwd_arc)
-            .await?;
+    let mut cmd = resolve_and_build_command(resolver, subcommand, envs, cwd, cwd_arc).await?;
     cmd.stdout(Stdio::piped());
     cmd.stderr(Stdio::piped());
     if force_color_if_terminal && std::io::stdout().is_terminal() {

packages/cli/binding/src/cli/handler.rs

@@ -71,8 +71,7 @@ impl CommandHandler for VitePlusCommandHandler {
                 )))
             }
             CLIArgs::Synthesizable(subcmd) => {
-                let resolved =
-                    self.resolver.resolve(subcmd, None, &command.envs, &command.cwd).await?;
+                let resolved = self.resolver.resolve(subcmd, &command.envs, &command.cwd).await?;
                 Ok(HandledCommand::Synthesized(resolved.into_synthetic_plan_request()))
             }
             CLIArgs::ViteTask(cmd) => Ok(HandledCommand::ViteTaskCommand(cmd)),

packages/cli/binding/src/cli/mod.rs

@@ -74,7 +74,6 @@ async fn execute_direct_subcommand(
                 resolve_and_execute_with_filter(
                     &resolver,
                     other,
-                    None,
                     &envs,
                     cwd,
                     &cwd_arc,
@@ -86,7 +85,6 @@ async fn execute_direct_subcommand(
                 resolve_and_execute_with_filter(
                     &resolver,
                     other,
-                    None,
                     &envs,
                     cwd,
                     &cwd_arc,
@@ -95,7 +93,7 @@ async fn execute_direct_subcommand(
                 )
                 .await?
             } else {
-                resolve_and_execute(&resolver, other, None, &envs, cwd, &cwd_arc).await?
+                resolve_and_execute(&resolver, other, &envs, cwd, &cwd_arc).await?
             }
         }
     };

packages/cli/binding/src/cli/resolver.rs

@@ -65,32 +65,17 @@ impl SubcommandResolver {
     pub(super) async fn resolve(
         &self,
         subcommand: SynthesizableSubcommand,
-        resolved_vite_config: Option<&ResolvedUniversalViteConfig>,
         envs: &Arc<FxHashMap<Arc<OsStr>, Arc<OsStr>>>,
         cwd: &Arc<AbsolutePath>,
     ) -> anyhow::Result<ResolvedSubcommand> {
         match subcommand {
-            SynthesizableSubcommand::Lint { mut args } => {
+            SynthesizableSubcommand::Lint { args } => {
                 let cli_options = self.cli_options()?;
                 let resolved = (cli_options.lint)().await?;
                 let js_path = resolved.bin_path;
                 let js_path_str = js_path
                     .to_str()
                     .ok_or_else(|| anyhow::anyhow!("lint JS path is not valid UTF-8"))?;
-                let owned_resolved_vite_config;
-                let resolved_vite_config = if let Some(config) = resolved_vite_config {
-                    config
-                } else {
-                    owned_resolved_vite_config = self.resolve_universal_vite_config().await?;
-                    &owned_resolved_vite_config
-                };
-
-                if let (Some(_), Some(config_file)) =
-                    (&resolved_vite_config.lint, &resolved_vite_config.config_file)
-                {
-                    args.insert(0, "-c".to_string());
-                    args.insert(1, config_file.clone());
-                }
 
                 Ok(ResolvedSubcommand {
                     program: Arc::from(OsStr::new("node")),
@@ -106,27 +91,13 @@ impl SubcommandResolver {
                     envs: merge_resolved_envs_with_version(envs, resolved.envs),
                 })
             }
-            SynthesizableSubcommand::Fmt { mut args } => {
+            SynthesizableSubcommand::Fmt { args } => {
                 let cli_options = self.cli_options()?;
                 let resolved = (cli_options.fmt)().await?;
                 let js_path = resolved.bin_path;
                 let js_path_str = js_path
                     .to_str()
                     .ok_or_else(|| anyhow::anyhow!("fmt JS path is not valid UTF-8"))?;
-                let owned_resolved_vite_config;
-                let resolved_vite_config = if let Some(config) = resolved_vite_config {
-                    config
-                } else {
-                    owned_resolved_vite_config = self.resolve_universal_vite_config().await?;
-                    &owned_resolved_vite_config
-                };
-
-                if let (Some(_), Some(config_file)) =
-                    (&resolved_vite_config.fmt, &resolved_vite_config.config_file)
-                {
-                    args.insert(0, "-c".to_string());
-                    args.insert(1, config_file.clone());
-                }
 
                 Ok(ResolvedSubcommand {
                     program: Arc::from(OsStr::new("node")),

packages/cli/snap-tests/nested-oxc-config-proj-1/snap.txt

@@ -1,25 +1,14 @@
-> # Reproduces oxc-project/oxc#20416: nested vite.config.ts in packages/proj-1
-> # should override root config when `vp lint` / `vp fmt` run from that cwd.
-> # proj-1 disables no-debugger and turns off singleQuote, so both commands
-> # should pass. If the root config leaks through, lint reports a debugger
-> # violation and fmt reports a quote-style diff.
-[1]> cd packages/proj-1 && vp lint # expected: pass (proj-1 disables no-debugger); actual: fails with root rule
-
-  × eslint(no-debugger): `debugger` statement is not allowed
-   ╭─[src/index.js:2:3]
- 1 │ function hello() {
- 2 │   debugger;
-   ·   ─────────
- 3 │   return "hello from proj-1";
-   ╰────
-  help: Remove the debugger statement
-
-Found 0 warnings and 1 error.
+> # Regression test for oxc-project/oxc#20416: nested vite.config.ts in
+> # packages/proj-1 must override the workspace root config when `vp lint`
+> # and `vp fmt` run from that cwd. Root has `no-debugger: error` and
+> # `singleQuote: true`, proj-1 overrides both to `off` / `false`. If the
+> # root config leaks through, lint reports a debugger violation and fmt
+> # reports a quote-style diff.
+> cd packages/proj-1 && vp lint
+Found 0 warnings and 0 errors.
 Finished in <variable>ms on 2 files with <variable> rules using <variable> threads.
 
-[1]> cd packages/proj-1 && vp fmt --check # expected: pass (proj-1 sets singleQuote:false); actual: fails with root singleQuote:true
+> cd packages/proj-1 && vp fmt --check src
 Checking formatting...
-src/index.js (<variable>ms)
-
-Format issues found in above 1 files. Run without `--check` to fix.
-Finished in <variable>ms on 3 files using <variable> threads.
+All matched files use the correct format.
+Finished in <variable>ms on 1 files using <variable> threads.

packages/cli/snap-tests/nested-oxc-config-proj-1/steps.json

@@ -1,12 +1,13 @@
 {
   "ignoredPlatforms": ["win32"],
   "commands": [
-    "# Reproduces oxc-project/oxc#20416: nested vite.config.ts in packages/proj-1",
-    "# should override root config when `vp lint` / `vp fmt` run from that cwd.",
-    "# proj-1 disables no-debugger and turns off singleQuote, so both commands",
-    "# should pass. If the root config leaks through, lint reports a debugger",
-    "# violation and fmt reports a quote-style diff.",
-    "cd packages/proj-1 && vp lint # expected: pass (proj-1 disables no-debugger); actual: fails with root rule",
-    "cd packages/proj-1 && vp fmt --check # expected: pass (proj-1 sets singleQuote:false); actual: fails with root singleQuote:true"
+    "# Regression test for oxc-project/oxc#20416: nested vite.config.ts in",
+    "# packages/proj-1 must override the workspace root config when `vp lint`",
+    "# and `vp fmt` run from that cwd. Root has `no-debugger: error` and",
+    "# `singleQuote: true`, proj-1 overrides both to `off` / `false`. If the",
+    "# root config leaks through, lint reports a debugger violation and fmt",
+    "# reports a quote-style diff.",
+    "cd packages/proj-1 && vp lint",
+    "cd packages/proj-1 && vp fmt --check src"
   ]
 }

packages/cli/snap-tests/workspace-lint-subpackage/snap.txt

@@ -1,13 +1,3 @@
 > cd packages/app-a && vp lint # sub-workspace has no-console:off but root has no-console:warn
-
-  ⚠ eslint(no-console): Unexpected console statement.
-   ╭─[src/index.js:2:3]
- 1 │ function hello() {
- 2 │   console.log('hello from app-a');
-   ·   ───────────
- 3 │   return 'hello';
-   ╰────
-  help: Delete this console statement.
-
-Found 1 warning and 0 errors.
+Found 0 warnings and 0 errors.
 Finished in <variable>ms on 2 files with <variable> rules using <variable> threads.