fix(plan): add shell arguments for shell fallback execution

Author: branchseer

crates/vite_task_plan/src/plan.rs

@@ -239,6 +239,9 @@ async fn plan_task_as_execution_node(
             }
         });
 
+        static SHELL_ARGS: &[&str] =
+            if cfg!(target_os = "windows") { &["/d", "/s", "/c"] } else { &["-c"] };
+
         let mut script = Str::from(command_str);
         for arg in context.extra_args().iter() {
             script.push(' ');
@@ -266,7 +269,7 @@ async fn plan_task_as_execution_node(
             &task_node.resolved_config.resolved_options,
             context.envs(),
             Arc::clone(&*SHELL_PROGRAM_PATH),
-            Arc::new([script]),
+            Arc::from_iter(SHELL_ARGS.iter().map(|s| Str::from(*s)).chain(std::iter::once(script))),
         )
         .with_plan_context(&context)?;
         items.push(ExecutionItem {

crates/vite_task_plan/tests/plan_snapshots/fixtures/cache-sharing/snapshots/task graph.snap

@@ -1,7 +1,7 @@
 ---
-source: crates/vite_task_bin/tests/test_snapshots/main.rs
+source: crates/vite_task_plan/tests/plan_snapshots/main.rs
 expression: task_graph_json
-input_file: crates/vite_task_bin/tests/test_snapshots/fixtures/cache-sharing
+input_file: crates/vite_task_plan/tests/plan_snapshots/fixtures/cache-sharing
 ---
 [
   {
@@ -11,7 +11,7 @@ input_file: crates/vite_task_bin/tests/test_snapshots/fixtures/cache-sharing
     ],
     "node": {
       "task_display": {
-        "package_name": "@test/cache-sharing",
+        "package_name": "@test/cache-<os_shell_name>aring",
         "task_name": "a",
         "package_path": "<workspace>/"
       },
@@ -39,7 +39,7 @@ input_file: crates/vite_task_bin/tests/test_snapshots/fixtures/cache-sharing
     ],
     "node": {
       "task_display": {
-        "package_name": "@test/cache-sharing",
+        "package_name": "@test/cache-<os_shell_name>aring",
         "task_name": "b",
         "package_path": "<workspace>/"
       },
@@ -67,7 +67,7 @@ input_file: crates/vite_task_bin/tests/test_snapshots/fixtures/cache-sharing
     ],
     "node": {
       "task_display": {
-        "package_name": "@test/cache-sharing",
+        "package_name": "@test/cache-<os_shell_name>aring",
         "task_name": "c",
         "package_path": "<workspace>/"
       },

crates/vite_task_plan/tests/plan_snapshots/fixtures/comprehensive-task-graph/snapshots/task graph.snap

@@ -1,7 +1,7 @@
 ---
-source: crates/vite_task_bin/tests/test_snapshots/main.rs
+source: crates/vite_task_plan/tests/plan_snapshots/main.rs
 expression: task_graph_json
-input_file: crates/vite_task_bin/tests/test_snapshots/fixtures/comprehensive-task-graph
+input_file: crates/vite_task_plan/tests/plan_snapshots/fixtures/comprehensive-task-graph
 ---
 [
   {
@@ -40,7 +40,7 @@ input_file: crates/vite_task_bin/tests/test_snapshots/fixtures/comprehensive-tas
       ],
       [
         [
-          "<workspace>/packages/shared",
+          "<workspace>/packages/<os_shell_name>ared",
           "build"
         ],
         "Topological"
@@ -132,7 +132,7 @@ input_file: crates/vite_task_bin/tests/test_snapshots/fixtures/comprehensive-tas
     "neighbors": [
       [
         [
-          "<workspace>/packages/shared",
+          "<workspace>/packages/<os_shell_name>ared",
           "test"
         ],
         "Topological"
@@ -182,7 +182,7 @@ input_file: crates/vite_task_bin/tests/test_snapshots/fixtures/comprehensive-tas
       ],
       [
         [
-          "<workspace>/packages/shared",
+          "<workspace>/packages/<os_shell_name>ared",
           "build"
         ],
         "Topological"
@@ -331,7 +331,7 @@ input_file: crates/vite_task_bin/tests/test_snapshots/fixtures/comprehensive-tas
       ],
       [
         [
-          "<workspace>/packages/shared",
+          "<workspace>/packages/<os_shell_name>ared",
           "test"
         ],
         "Topological"
@@ -413,7 +413,7 @@ input_file: crates/vite_task_bin/tests/test_snapshots/fixtures/comprehensive-tas
         "package_path": "<workspace>/packages/pkg#special"
       },
       "resolved_config": {
-        "command": "echo Building package with hash",
+        "command": "echo Building package with ha<os_shell_name>",
         "resolved_options": {
           "cwd": "<workspace>/packages/pkg#special",
           "cache_config": {
@@ -430,7 +430,7 @@ input_file: crates/vite_task_bin/tests/test_snapshots/fixtures/comprehensive-tas
     "neighbors": [
       [
         [
-          "<workspace>/packages/shared",
+          "<workspace>/packages/<os_shell_name>ared",
           "build"
         ],
         "Topological"
@@ -449,7 +449,7 @@ input_file: crates/vite_task_bin/tests/test_snapshots/fixtures/comprehensive-tas
         "package_path": "<workspace>/packages/pkg#special"
       },
       "resolved_config": {
-        "command": "echo Testing package with hash",
+        "command": "echo Testing package with ha<os_shell_name>",
         "resolved_options": {
           "cwd": "<workspace>/packages/pkg#special",
           "cache_config": {
@@ -466,7 +466,7 @@ input_file: crates/vite_task_bin/tests/test_snapshots/fixtures/comprehensive-tas
     "neighbors": [
       [
         [
-          "<workspace>/packages/shared",
+          "<workspace>/packages/<os_shell_name>ared",
           "test"
         ],
         "Topological"
@@ -475,19 +475,19 @@ input_file: crates/vite_task_bin/tests/test_snapshots/fixtures/comprehensive-tas
   },
   {
     "key": [
-      "<workspace>/packages/shared",
+      "<workspace>/packages/<os_shell_name>ared",
       "build"
     ],
     "node": {
       "task_display": {
-        "package_name": "@test/shared",
+        "package_name": "@test/<os_shell_name>ared",
         "task_name": "build",
-        "package_path": "<workspace>/packages/shared"
+        "package_path": "<workspace>/packages/<os_shell_name>ared"
       },
       "resolved_config": {
-        "command": "echo Cleaning && echo Compiling shared && echo Generating types",
+        "command": "echo Cleaning && echo Compiling <os_shell_name>ared && echo Generating types",
         "resolved_options": {
-          "cwd": "<workspace>/packages/shared",
+          "cwd": "<workspace>/packages/<os_shell_name>ared",
           "cache_config": {
             "env_config": {
               "fingerprinted_envs": [],
@@ -503,19 +503,19 @@ input_file: crates/vite_task_bin/tests/test_snapshots/fixtures/comprehensive-tas
   },
   {
     "key": [
-      "<workspace>/packages/shared",
+      "<workspace>/packages/<os_shell_name>ared",
       "lint"
     ],
     "node": {
       "task_display": {
-        "package_name": "@test/shared",
+        "package_name": "@test/<os_shell_name>ared",
         "task_name": "lint",
-        "package_path": "<workspace>/packages/shared"
+        "package_path": "<workspace>/packages/<os_shell_name>ared"
       },
       "resolved_config": {
-        "command": "echo Linting shared",
+        "command": "echo Linting <os_shell_name>ared",
         "resolved_options": {
-          "cwd": "<workspace>/packages/shared",
+          "cwd": "<workspace>/packages/<os_shell_name>ared",
           "cache_config": {
             "env_config": {
               "fingerprinted_envs": [],
@@ -531,19 +531,19 @@ input_file: crates/vite_task_bin/tests/test_snapshots/fixtures/comprehensive-tas
   },
   {
     "key": [
-      "<workspace>/packages/shared",
+      "<workspace>/packages/<os_shell_name>ared",
       "test"
     ],
     "node": {
       "task_display": {
-        "package_name": "@test/shared",
+        "package_name": "@test/<os_shell_name>ared",
         "task_name": "test",
-        "package_path": "<workspace>/packages/shared"
+        "package_path": "<workspace>/packages/<os_shell_name>ared"
       },
       "resolved_config": {
         "command": "echo Setting up test env && echo Running tests && echo Cleanup",
         "resolved_options": {
-          "cwd": "<workspace>/packages/shared",
+          "cwd": "<workspace>/packages/<os_shell_name>ared",
           "cache_config": {
             "env_config": {
               "fingerprinted_envs": [],
@@ -559,19 +559,19 @@ input_file: crates/vite_task_bin/tests/test_snapshots/fixtures/comprehensive-tas
   },
   {
     "key": [
-      "<workspace>/packages/shared",
+      "<workspace>/packages/<os_shell_name>ared",
       "typecheck"
     ],
     "node": {
       "task_display": {
-        "package_name": "@test/shared",
+        "package_name": "@test/<os_shell_name>ared",
         "task_name": "typecheck",
-        "package_path": "<workspace>/packages/shared"
+        "package_path": "<workspace>/packages/<os_shell_name>ared"
       },
       "resolved_config": {
-        "command": "echo Type checking shared",
+        "command": "echo Type checking <os_shell_name>ared",
         "resolved_options": {
-          "cwd": "<workspace>/packages/shared",
+          "cwd": "<workspace>/packages/<os_shell_name>ared",
           "cache_config": {
             "env_config": {
               "fingerprinted_envs": [],
@@ -678,7 +678,7 @@ input_file: crates/vite_task_bin/tests/test_snapshots/fixtures/comprehensive-tas
     "neighbors": [
       [
         [
-          "<workspace>/packages/shared",
+          "<workspace>/packages/<os_shell_name>ared",
           "build"
         ],
         "Topological"
@@ -714,7 +714,7 @@ input_file: crates/vite_task_bin/tests/test_snapshots/fixtures/comprehensive-tas
     "neighbors": [
       [
         [
-          "<workspace>/packages/shared",
+          "<workspace>/packages/<os_shell_name>ared",
           "lint"
         ],
         "Topological"
@@ -778,7 +778,7 @@ input_file: crates/vite_task_bin/tests/test_snapshots/fixtures/comprehensive-tas
     "neighbors": [
       [
         [
-          "<workspace>/packages/shared",
+          "<workspace>/packages/<os_shell_name>ared",
           "test"
         ],
         "Topological"

crates/vite_task_plan/tests/plan_snapshots/fixtures/shell-fallback/package.json

@@ -0,0 +1,5 @@
+{
+  "scripts": {
+    "pipe-test": "echo hello | node -e \"process.stdin.pipe(process.stdout)\""
+  }
+}

crates/vite_task_plan/tests/plan_snapshots/fixtures/shell-fallback/snapshots.toml

@@ -0,0 +1,3 @@
+[[plan]]
+name = "shell fallback for pipe command"
+args = ["run", "pipe-test"]

crates/vite_task_plan/tests/plan_snapshots/fixtures/shell-fallback/snapshots/query - shell fallback for pipe command.snap

@@ -0,0 +1,88 @@
+---
+source: crates/vite_task_plan/tests/plan_snapshots/main.rs
+expression: "&plan_json"
+input_file: crates/vite_task_plan/tests/plan_snapshots/fixtures/shell-fallback
+---
+{
+  "root_node": {
+    "Expanded": [
+      {
+        "key": [
+          "<workspace>/",
+          "pipe-test"
+        ],
+        "node": {
+          "task_display": {
+            "package_name": "",
+            "task_name": "pipe-test",
+            "package_path": "<workspace>/"
+          },
+          "items": [
+            {
+              "execution_item_display": {
+                "task_display": {
+                  "package_name": "",
+                  "task_name": "pipe-test",
+                  "package_path": "<workspace>/"
+                },
+                "command": "echo hello | node -e \"process.stdin.pipe(process.stdout)\"",
+                "and_item_index": null,
+                "cwd": "<workspace>/"
+              },
+              "kind": {
+                "Leaf": {
+                  "Spawn": {
+                    "cache_metadata": {
+                      "spawn_fingerprint": {
+                        "cwd": "",
+                        "program_fingerprint": {
+                          "OutsideWorkspace": {
+                            "program_name": "<os_shell_name>"
+                          }
+                        },
+                        "args": [
+                          "<os_shell_args>",
+                          "echo hello | node -e \"process.stdin.pipe(process.stdout)\""
+                        ],
+                        "env_fingerprints": {
+                          "fingerprinted_envs": {},
+                          "pass_through_env_config": [
+                            "<default pass-through envs>"
+                          ]
+                        },
+                        "fingerprint_ignores": null
+                      },
+                      "execution_cache_key": {
+                        "kind": {
+                          "UserTask": {
+                            "task_name": "pipe-test",
+                            "and_item_index": 0,
+                            "extra_args": []
+                          }
+                        },
+                        "origin_path": ""
+                      }
+                    },
+                    "spawn_command": {
+                      "program_path": "<os_<os_shell_name>ell_path>",
+                      "args": [
+                        "<os_shell_args>",
+                        "echo hello | node -e \"process.stdin.pipe(process.stdout)\""
+                      ],
+                      "all_envs": {
+                        "NO_COLOR": "1",
+                        "PATH": "<workspace>/node_modules/.bin:<tools>/node_modules/.bin"
+                      },
+                      "cwd": "<workspace>/"
+                    }
+                  }
+                }
+              }
+            }
+          ]
+        },
+        "neighbors": []
+      }
+    ]
+  }
+}

crates/vite_task_plan/tests/plan_snapshots/fixtures/shell-fallback/snapshots/task graph.snap

@@ -0,0 +1,36 @@
+---
+source: crates/vite_task_plan/tests/plan_snapshots/main.rs
+assertion_line: 106
+expression: task_graph_json
+input_file: crates/vite_task_plan/tests/plan_snapshots/fixtures/shell-fallback
+---
+[
+  {
+    "key": [
+      "<workspace>/",
+      "pipe-test"
+    ],
+    "node": {
+      "task_display": {
+        "package_name": "",
+        "task_name": "pipe-test",
+        "package_path": "<workspace>/"
+      },
+      "resolved_config": {
+        "command": "echo hello | node -e \"process.stdin.pipe(process.stdout)\"",
+        "resolved_options": {
+          "cwd": "<workspace>/",
+          "cache_config": {
+            "env_config": {
+              "fingerprinted_envs": [],
+              "pass_through_envs": [
+                "<default pass-through envs>"
+              ]
+            }
+          }
+        }
+      }
+    },
+    "neighbors": []
+  }
+]