fix(plan): reject shell cd before array continuations

Author: jong-kyung

crates/vite_shell/src/lib.rs

@@ -135,6 +135,45 @@ fn pipeline_to_command(pipeline: &Pipeline) -> Option<(TaskParsedCommand, Range<
     Some((TaskParsedCommand { envs, program: unquote(program)?, args }, range))
 }
 
+fn pipeline_program_is_cd(pipeline: &Pipeline) -> bool {
+    let Pipeline { timed: None, bang: false, seq } = pipeline else {
+        return false;
+    };
+    let [Command::Simple(simple_command)] = seq.as_slice() else {
+        return false;
+    };
+    let SimpleCommand { word_or_name: Some(program), .. } = simple_command else {
+        return false;
+    };
+    unquote(program).is_some_and(|program| program.as_str() == "cd")
+}
+
+#[must_use]
+pub fn contains_cd_command(cmd: &str) -> bool {
+    let mut parser = Parser::new(cmd.as_bytes(), &PARSER_OPTIONS);
+    let Ok(Program { complete_commands }) = parser.parse_program() else {
+        return false;
+    };
+
+    for compound_list in &complete_commands {
+        for CompoundListItem(and_or_list, _) in &compound_list.0 {
+            if pipeline_program_is_cd(&and_or_list.first) {
+                return true;
+            }
+            for and_or in &and_or_list.additional {
+                let pipeline = match and_or {
+                    AndOr::And(pipeline) | AndOr::Or(pipeline) => pipeline,
+                };
+                if pipeline_program_is_cd(pipeline) {
+                    return true;
+                }
+            }
+        }
+    }
+
+    false
+}
+
 #[must_use]
 pub fn try_parse_as_and_list(cmd: &str) -> Option<Vec<(TaskParsedCommand, Range<usize>)>> {
     let mut parser = Parser::new(cmd.as_bytes(), &PARSER_OPTIONS);
@@ -162,6 +201,19 @@ pub fn try_parse_as_and_list(cmd: &str) -> Option<Vec<(TaskParsedCommand, Range<
 mod tests {
     use super::*;
 
+    #[test]
+    fn test_contains_cd_command_with_unresolved_arg() {
+        assert!(contains_cd_command(r#"cd "$APP_DIR""#));
+        assert!(contains_cd_command(r#"echo ok && cd "$APP_DIR""#));
+        assert!(contains_cd_command(r#"FOO=bar 'cd' "$APP_DIR""#));
+    }
+
+    #[test]
+    fn test_contains_cd_command_ignores_cd_argument_text() {
+        assert!(!contains_cd_command(r#"echo "cd $APP_DIR""#));
+        assert!(!contains_cd_command("cdtool $APP_DIR"));
+    }
+
     #[test]
     fn test_parse_single_command() {
         let source = r"A=B hello world";

crates/vite_task_plan/src/plan.rs

@@ -16,7 +16,7 @@ use futures_util::FutureExt;
 use petgraph::Direction;
 use rustc_hash::FxHashMap;
 use vite_path::{AbsolutePath, AbsolutePathBuf, RelativePathBuf, relative::InvalidPathDataError};
-use vite_shell::{TaskParsedCommand, try_parse_as_and_list};
+use vite_shell::{TaskParsedCommand, contains_cd_command, try_parse_as_and_list};
 use vite_str::Str;
 use vite_task_graph::{
     TaskNodeIndex, TaskSource,
@@ -88,6 +88,7 @@ enum PlannedCommand {
 
 #[expect(clippy::result_large_err, reason = "Error is large for diagnostics")]
 fn planned_commands(command: &TaskCommand) -> Result<Vec<PlannedCommand>, Error> {
+    let mut array_len = None;
     let snippets: Box<dyn Iterator<Item = &Str> + '_> = match command {
         TaskCommand::String(command) => Box::new(std::iter::once(command)),
         TaskCommand::Array(commands) => {
@@ -99,12 +100,13 @@ fn planned_commands(command: &TaskCommand) -> Result<Vec<PlannedCommand>, Error>
                     "command array entries must not be empty".into(),
                 ));
             }
+            array_len = Some(commands.len());
             Box::new(commands.iter())
         }
     };
 
     let mut planned = Vec::new();
-    for snippet in snippets {
+    for (snippet_index, snippet) in snippets.enumerate() {
         if let Some(parsed) = try_parse_as_and_list(snippet.as_str()) {
             for (and_item, range) in parsed {
                 planned.push(PlannedCommand::Parsed {
@@ -114,6 +116,14 @@ fn planned_commands(command: &TaskCommand) -> Result<Vec<PlannedCommand>, Error>
                 });
             }
         } else {
+            if array_len.is_some_and(|len| snippet_index + 1 < len)
+                && contains_cd_command(snippet.as_str())
+            {
+                return Err(Error::InvalidTaskCommand(
+                    "command array entries that change directory in a shell must be the final entry"
+                        .into(),
+                ));
+            }
             planned.push(PlannedCommand::Shell(snippet.clone()));
         }
     }

crates/vite_task_plan/tests/plan_snapshots/fixtures/task_command_shorthands/snapshots.toml

@@ -22,6 +22,10 @@ args = ["run", "array_cd_spawn"]
 name = "array_cd_shell"
 args = ["run", "array_cd_shell"]
 
+[[plan]]
+name = "array_shell_cd_before_next_error"
+args = ["run", "array_shell_cd_before_next"]
+
 [[plan]]
 name = "object_array_cache_false"
 args = ["run", "object_array_cache_false"]

crates/vite_task_plan/tests/plan_snapshots/fixtures/task_command_shorthands/snapshots/query_array_shell_cd_before_next_error.snap

@@ -0,0 +1 @@
+Invalid task command: command array entries that change directory in a shell must be the final entry

crates/vite_task_plan/tests/plan_snapshots/fixtures/task_command_shorthands/snapshots/task_graph.jsonc

@@ -84,6 +84,48 @@
     },
     "neighbors": []
   },
+  {
+    "key": [
+      "<workspace>/",
+      "array_shell_cd_before_next"
+    ],
+    "node": {
+      "task_display": {
+        "package_name": "@test/task-command-shorthands",
+        "task_name": "array_shell_cd_before_next",
+        "package_path": "<workspace>/"
+      },
+      "resolved_config": {
+        "command": [
+          "cd \"$APP_DIR\"",
+          "vtt print-file package.json"
+        ],
+        "resolved_options": {
+          "cwd": "<workspace>/",
+          "cache_config": {
+            "env_config": {
+              "fingerprinted_envs": [],
+              "untracked_env": [
+                "<default untracked envs>"
+              ]
+            },
+            "input_config": {
+              "includes_auto": true,
+              "positive_globs": [],
+              "negative_globs": []
+            },
+            "output_config": {
+              "includes_auto": false,
+              "positive_globs": [],
+              "negative_globs": []
+            }
+          }
+        }
+      },
+      "source": "TaskConfig"
+    },
+    "neighbors": []
+  },
   {
     "key": [
       "<workspace>/",

crates/vite_task_plan/tests/plan_snapshots/fixtures/task_command_shorthands/vite-task.json

@@ -6,6 +6,7 @@
     "nested_vt_array": ["vtt print-file package.json", "vt run string_shorthand"],
     "array_cd_spawn": ["cd snapshots", "vtt print-file package.json"],
     "array_cd_shell": ["cd snapshots", "echo $PWD"],
+    "array_shell_cd_before_next": ["cd \"$APP_DIR\"", "vtt print-file package.json"],
     "object_array_cache_false": {
       "command": ["vtt print-file package.json", "vtt print-file vite-task.json", "vtt print-file package.json"],
       "cache": false