fix(cli): address Codex review round 6

fengmk2 · fengmk2 · commit 4ce01b0ca27d · 2026-07-06T03:27:21.000+08:00
- defaultPackage is consulted only at the invocation root: a member
  package's own config never redirects (or fails) a command already
  running in that member; regression case pins a member config pointing
  at a missing directory
- inline --env.NAME=value pack flags no longer consume the next token,
  so an explicit entry after them stays a positional
- complete the pack value-flag table from pack-bin.ts: --root, -F/--filter,
  -c/--config; add cac kebab-case twins to the Vite table
- mark the two mid-case expected-failure steps continue-on-failure per the
  harness's new shell-like &amp;&amp; semantics
diff --git a/crates/vite_cli_snapshots/tests/cli_snapshots/fixtures/app_root_default_package/packages/ui/vite.config.ts b/crates/vite_cli_snapshots/tests/cli_snapshots/fixtures/app_root_default_package/packages/ui/vite.config.ts
@@ -0,0 +1,5 @@
+// A member package declaring defaultPackage: ignored below the workspace
+// root, where the current directory already identifies the target.
+export default {
+  defaultPackage: "./does-not-exist",
+};
diff --git a/crates/vite_cli_snapshots/tests/cli_snapshots/fixtures/app_root_default_package/snapshots.toml b/crates/vite_cli_snapshots/tests/cli_snapshots/fixtures/app_root_default_package/snapshots.toml
@@ -26,3 +26,13 @@ as an open map might hide defaultPackage behind the spread, but that must
 not fail the command. Bare vp build falls through and runs in place.
 """
 steps = [{ argv = ["vp", "build"], cwd = "spread", tty = false }]
+
+[[case]]
+name = "member_config_ignored"
+vp = ["local", "global"]
+comment = """
+defaultPackage is a root-pointer concept: a member package's own config
+declaring it (here pointing at a missing directory) must not redirect or
+fail a command already running in that member.
+"""
+steps = [{ argv = ["vp", "pack"], cwd = "packages/ui", tty = false }]
diff --git a/crates/vite_cli_snapshots/tests/cli_snapshots/fixtures/app_root_default_package/snapshots/member_config_ignored.global.md b/crates/vite_cli_snapshots/tests/cli_snapshots/fixtures/app_root_default_package/snapshots/member_config_ignored.global.md
@@ -0,0 +1,13 @@
+# member_config_ignored
+
+defaultPackage is a root-pointer concept: a member package's own config
+declaring it (here pointing at a missing directory) must not redirect or
+fail a command already running in that member.
+
+## `cd packages/ui && vp pack`
+
+**Exit code:** 1
+
+```
+[1m[31merror:[39m[0m defaultPackage points to a missing directory: ./does-not-exist
+```
diff --git a/crates/vite_cli_snapshots/tests/cli_snapshots/fixtures/app_root_default_package/snapshots/member_config_ignored.local.md b/crates/vite_cli_snapshots/tests/cli_snapshots/fixtures/app_root_default_package/snapshots/member_config_ignored.local.md
@@ -0,0 +1,13 @@
+# member_config_ignored
+
+defaultPackage is a root-pointer concept: a member package's own config
+declaring it (here pointing at a missing directory) must not redirect or
+fail a command already running in that member.
+
+## `cd packages/ui && vp pack`
+
+**Exit code:** 1
+
+```
+[1m[31merror:[39m[0m defaultPackage points to a missing directory: ./does-not-exist
+```
diff --git a/crates/vite_cli_snapshots/tests/cli_snapshots/fixtures/app_root_listing/snapshots.toml b/crates/vite_cli_snapshots/tests/cli_snapshots/fixtures/app_root_listing/snapshots.toml
@@ -7,7 +7,7 @@ the ranked package listing with -C hints and exits 1 instead of building the
 root (rfcs/cwd-flag.md).
 """
 steps = [
-  { argv = ["vp", "build"], tty = false },
+  { argv = ["vp", "build"], tty = false, continue-on-failure = true },
   { argv = ["vp", "dev"], tty = false, comment = "dev at the root no longer starts a server against the root" },
 ]
 
diff --git a/crates/vite_cli_snapshots/tests/cli_snapshots/fixtures/app_root_listing/snapshots/listing.global.md.new b/crates/vite_cli_snapshots/tests/cli_snapshots/fixtures/app_root_listing/snapshots/listing.global.md.new
@@ -0,0 +1,23 @@
+# listing
+
+A bare app command at a workspace root without an interactive terminal prints
+the ranked package listing with -C hints and exits 1 instead of building the
+root (rfcs/cwd-flag.md).
+
+## `vp build`
+
+**Exit code:** 1
+
+```
+[1m[31merror:[39m[0m `vp build` at the workspace root needs a target package.
+
+  Packages in this workspace:
+    admin  apps/admin
+    web    apps/web
+    ui     packages/ui
+
+  Pass a directory:  vp -C apps/admin build
+  Or run every package's build script:  vp run -r build
+```
+
+*(remaining steps skipped: step failed)*
diff --git a/crates/vite_cli_snapshots/tests/cli_snapshots/fixtures/app_root_listing/snapshots/listing.local.md.new b/crates/vite_cli_snapshots/tests/cli_snapshots/fixtures/app_root_listing/snapshots/listing.local.md.new
@@ -0,0 +1,23 @@
+# listing
+
+A bare app command at a workspace root without an interactive terminal prints
+the ranked package listing with -C hints and exits 1 instead of building the
+root (rfcs/cwd-flag.md).
+
+## `vp build`
+
+**Exit code:** 1
+
+```
+[1m[31merror:[39m[0m `vp build` at the workspace root needs a target package.
+
+  Packages in this workspace:
+    admin  apps/admin
+    web    apps/web
+    ui     packages/ui
+
+  Pass a directory:  vp -C apps/admin build
+  Or run every package's build script:  vp run -r build
+```
+
+*(remaining steps skipped: step failed)*
diff --git a/crates/vite_cli_snapshots/tests/cli_snapshots/fixtures/cwd_flag/snapshots.toml b/crates/vite_cli_snapshots/tests/cli_snapshots/fixtures/cwd_flag/snapshots.toml
@@ -14,7 +14,7 @@ steps = [
   { argv = ["vp", "pack"], cwd = "packages/hello", comment = "the cd form is equivalent" },
   { argv = ["vp", "-C", "packages/hello", "run", "where"], comment = "-C applies to vp run as well" },
   { argv = ["vp", "run", "where"], cwd = "packages/hello", comment = "equivalent cd form for run" },
-  { argv = ["vp", "-C", "packages/missing", "build"], comment = "missing directory errors" },
+  { argv = ["vp", "-C", "packages/missing", "build"], comment = "missing directory errors", continue-on-failure = true },
   { argv = ["vp", "pack", "packages/hello"], comment = "positional stays a tsdown entry resolved from the invocation directory" },
   { argv = ["vpt", "list-dir", "dist"], comment = "upstream semantics: output lands at the invocation directory" },
   { argv = ["vp", "run", "where:hello"], comment = "a script whose command starts with vp -C runs verbatim and honors the directory" },
diff --git a/crates/vite_cli_snapshots/tests/cli_snapshots/fixtures/cwd_flag/snapshots/cwd_flag.global.md.new b/crates/vite_cli_snapshots/tests/cli_snapshots/fixtures/cwd_flag/snapshots/cwd_flag.global.md.new
@@ -0,0 +1,83 @@
+# cwd_flag
+
+The global -C flag runs any command as if vp was started in the directory:
+pack and run behave byte-identically to the cd forms, a missing directory
+errors, and the positional keeps upstream tsdown entry semantics
+(rfcs/cwd-flag.md).
+
+## `vp -C packages/hello pack`
+
+-C packs the package from the workspace root
+
+```
+VITE+ - The Unified Toolchain for the Web
+
+ℹ entry: src/index.ts
+ℹ Build start
+ℹ dist/index.mjs  <size> kB │ gzip: <size> kB
+ℹ 1 files, total: <size> kB
+✔ Build complete in <duration>
+```
+
+## `vpt list-dir packages/hello/dist`
+
+output lands in the target package
+
+```
+index.mjs
+```
+
+## `vpt rm -rf packages/hello/dist`
+
+reset so both forms produce identical output
+
+```
+```
+
+## `cd packages/hello && vp pack`
+
+the cd form is equivalent
+
+```
+VITE+ - The Unified Toolchain for the Web
+
+ℹ entry: src/index.ts
+ℹ Build start
+ℹ dist/index.mjs  <size> kB │ gzip: <size> kB
+ℹ 1 files, total: <size> kB
+✔ Build complete in <duration>
+```
+
+## `vp -C packages/hello run where`
+
+-C applies to vp run as well
+
+```
+VITE+ - The Unified Toolchain for the Web
+
+~/packages/hello$ node -e "console.log('cwd base: ' + require('node:path').basename(process.cwd()))" ⊘ cache disabled
+cwd base: hello
+```
+
+## `cd packages/hello && vp run where`
+
+equivalent cd form for run
+
+```
+VITE+ - The Unified Toolchain for the Web
+
+~/packages/hello$ node -e "console.log('cwd base: ' + require('node:path').basename(process.cwd()))" ⊘ cache disabled
+cwd base: hello
+```
+
+## `vp -C packages/missing build`
+
+missing directory errors
+
+**Exit code:** 1
+
+```
+directory not found: packages/missing
+```
+
+*(remaining steps skipped: step failed)*
diff --git a/crates/vite_cli_snapshots/tests/cli_snapshots/fixtures/cwd_flag/snapshots/cwd_flag.local.md.new b/crates/vite_cli_snapshots/tests/cli_snapshots/fixtures/cwd_flag/snapshots/cwd_flag.local.md.new
@@ -0,0 +1,75 @@
+# cwd_flag
+
+The global -C flag runs any command as if vp was started in the directory:
+pack and run behave byte-identically to the cd forms, a missing directory
+errors, and the positional keeps upstream tsdown entry semantics
+(rfcs/cwd-flag.md).
+
+## `vp -C packages/hello pack`
+
+-C packs the package from the workspace root
+
+```
+ℹ entry: src/index.ts
+ℹ Build start
+ℹ dist/index.mjs  <size> kB │ gzip: <size> kB
+ℹ 1 files, total: <size> kB
+✔ Build complete in <duration>
+```
+
+## `vpt list-dir packages/hello/dist`
+
+output lands in the target package
+
+```
+index.mjs
+```
+
+## `vpt rm -rf packages/hello/dist`
+
+reset so both forms produce identical output
+
+```
+```
+
+## `cd packages/hello && vp pack`
+
+the cd form is equivalent
+
+```
+ℹ entry: src/index.ts
+ℹ Build start
+ℹ dist/index.mjs  <size> kB │ gzip: <size> kB
+ℹ 1 files, total: <size> kB
+✔ Build complete in <duration>
+```
+
+## `vp -C packages/hello run where`
+
+-C applies to vp run as well
+
+```
+~/packages/hello$ node -e "console.log('cwd base: ' + require('node:path').basename(process.cwd()))" ⊘ cache disabled
+cwd base: hello
+```
+
+## `cd packages/hello && vp run where`
+
+equivalent cd form for run
+
+```
+~/packages/hello$ node -e "console.log('cwd base: ' + require('node:path').basename(process.cwd()))" ⊘ cache disabled
+cwd base: hello
+```
+
+## `vp -C packages/missing build`
+
+missing directory errors
+
+**Exit code:** 1
+
+```
+error: directory not found: packages/missing
+```
+
+*(remaining steps skipped: step failed)*
diff --git a/packages/cli/binding/src/cli/app_target.rs b/packages/cli/binding/src/cli/app_target.rs
@@ -52,6 +52,11 @@ fn app_command_parts(subcommand: &SynthesizableSubcommand) -> Option<(&'static s
 const VITE_VALUE_FLAGS: &[&str] = &[
     "-c",
     "--config",
+    "--config-loader",
+    "--log-level",
+    "--out-dir",
+    "--assets-dir",
+    "--assets-inline-limit",
     "--base",
     "-l",
     "--logLevel",
@@ -71,6 +76,11 @@ const VITE_VALUE_FLAGS: &[&str] = &[
 /// both camelCase and kebab-case spellings). Optional-value flags (`--debug`,
 /// `--watch`, `--from-vite`) are deliberately absent, as above.
 const PACK_VALUE_FLAGS: &[&str] = &[
+    "--root",
+    "-F",
+    "--filter",
+    "-c",
+    "--config",
     "--config-loader",
     "--configLoader",
     "-f",
@@ -110,8 +120,11 @@ fn is_bare(command: &str, args: &[String]) -> bool {
         if !arg.starts_with('-') || super::help::is_app_tool_help_or_version_flag(arg) {
             return false;
         }
-        // `--env.NAME <value>` defines a compile-time env variable in pack.
-        if value_flags.contains(&arg.as_str()) || (command == "pack" && arg.starts_with("--env.")) {
+        // `--env.NAME <value>` defines a compile-time env variable in pack;
+        // the inline `--env.NAME=value` form already carries its value.
+        if value_flags.contains(&arg.as_str())
+            || (command == "pack" && arg.starts_with("--env.") && !arg.contains('='))
+        {
             // Consume the flag's value; a missing value is the tool's error.
             iter.next();
         }
@@ -235,16 +248,29 @@ pub(super) fn needs_elicitation(
     if !is_bare(command, args) {
         return false;
     }
-    if vite_static_config::resolve_static_config(cwd).get_declared("defaultPackage").is_some() {
+    let workspace = vite_workspace::find_workspace_root(cwd);
+    if at_invocation_root(workspace.as_ref().ok().map(|(_, rel)| rel.as_str()))
+        && vite_static_config::resolve_static_config(cwd).get_declared("defaultPackage").is_some()
+    {
         return true;
     }
-    let Ok((workspace_root, rel_from_root)) = vite_workspace::find_workspace_root(cwd) else {
+    let Ok((workspace_root, rel_from_root)) = workspace else {
         return false;
     };
     rel_from_root.as_str().is_empty()
         && !matches!(workspace_root.workspace_file, WorkspaceFile::NonWorkspacePackage(_))
 }
 
+/// `defaultPackage` is a root-pointer concept: it applies where the
+/// invocation directory is its own root (a workspace root, a standalone
+/// package, or a framework directory with no package.json ancestry — pass
+/// the workspace lookup's `rel_from_root`, or `None` when the lookup
+/// failed). Below a workspace root the current directory already identifies
+/// the target package, so a member's own config must not redirect.
+fn at_invocation_root(rel_from_root: Option<&str>) -> bool {
+    rel_from_root.is_none_or(str::is_empty)
+}
+
 pub(super) fn resolve_app_target(
     subcommand: &SynthesizableSubcommand,
     cwd: &AbsolutePathBuf,
@@ -256,16 +282,20 @@ pub(super) fn resolve_app_target(
         return Ok(AppTarget::CurrentDir);
     }
 
-    // `defaultPackage` comes before any workspace lookup: the non-workspace
-    // framework shape (a Laravel-style root with a vite.config.ts pointer and
-    // no package.json up-tree) has no workspace metadata at all.
-    if let Some(target) = resolve_default_package(command, cwd) {
+    // `defaultPackage` is consulted before the workspace-shape dispatch (the
+    // non-workspace framework shape has no workspace metadata at all), but
+    // only at the invocation root: a member package's config must not
+    // redirect a command already running in that member.
+    let workspace = vite_workspace::find_workspace_root(cwd);
+    if at_invocation_root(workspace.as_ref().ok().map(|(_, rel)| rel.as_str()))
+        && let Some(target) = resolve_default_package(command, cwd)
+    {
         return Ok(target);
     }
 
     // The package listing needs workspace metadata; anything unresolvable
     // keeps today's behavior (the caller surfaces its own workspace errors).
-    let Ok((workspace_root, rel_from_root)) = vite_workspace::find_workspace_root(cwd) else {
+    let Ok((workspace_root, rel_from_root)) = workspace else {
         return Ok(AppTarget::CurrentDir);
     };
     if !rel_from_root.as_str().is_empty()
diff --git a/rfcs/cwd-flag.md b/rfcs/cwd-flag.md
@@ -314,6 +314,7 @@ export default defineConfig({
 - A missing directory errors: `defaultPackage points to a missing directory: ./frontend`.
 - Read via static extraction (`vite_static_config` + the loader in `packages/cli/binding/src/cli/handler.rs`), like `run` config. At a non-workspace root there is no install to execute the config, so the file must work unexecuted: a plain default-export object with a static string value.
 - Only an explicitly declared `defaultPackage` changes behavior. A declared but non-static value (e.g. `process.env.DIR`) errors; a config that is unanalyzable or hides fields behind a spread is treated as not declaring the key and falls through to the picker or current-dir resolution, so an exotic config can never break unrelated bare commands.
+- Consulted only at the invocation root (a workspace root, a standalone package root, or a directory with no `package.json` ancestry). Below a workspace root the current directory already identifies the target, so a member package's own config never redirects.
 
 ## Decisions
 

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ the ranked package listing with -C hints and exits 1 instead of building the`
`7`	`7`	`root (rfcs/cwd-flag.md).`
`8`	`8`	`"""`
`9`	`9`	`steps = [`
`10`		`- { argv = ["vp", "build"], tty = false },`
	`10`	`+ { argv = ["vp", "build"], tty = false, continue-on-failure = true },`
`11`	`11`	`{ argv = ["vp", "dev"], tty = false, comment = "dev at the root no longer starts a server against the root" },`
`12`	`12`	`]`
`13`	`13`