fix(task): preserve inherited extend task includes

Author: risu729

e2e/tasks/test_task_includes_mode_extend

@@ -1,27 +1,5 @@
 #!/usr/bin/env bash
 
-assert_output_contains() {
-	local output="$1"
-	local expected="$2"
-
-	if [[ $output == *"$expected"* ]]; then
-		ok "'$expected' is in output"
-	else
-		fail "expected '$expected' to be in '$output'"
-	fi
-}
-
-assert_output_not_contains() {
-	local output="$1"
-	local expected="$2"
-
-	if [[ $output != *"$expected"* ]]; then
-		ok "'$expected' is not in output"
-	else
-		fail "expected '$expected' not to be in '$output'"
-	fi
-}
-
 cat <<'TOML' >mise.toml
 [task_config]
 includes = ["tasks.toml", "root-tasks"]
@@ -64,37 +42,50 @@ echo "local dir task"
 SCRIPT
 chmod +x local-tasks/local-dir-task
 
-tasks="$(mise tasks ls)"
-assert_output_not_contains "$tasks" "default-task"
-assert_output_contains "$tasks" "root-file-task"
-assert_output_contains "$tasks" "root-dir-task"
-assert_output_contains "$tasks" "local-file-task"
-assert_output_contains "$tasks" "local-dir-task"
+mise tasks ls >tasks.out
+assert_not_contains "cat tasks.out" "default-task"
+assert_contains "cat tasks.out" "root-file-task"
+assert_contains "cat tasks.out" "root-dir-task"
+assert_contains "cat tasks.out" "local-file-task"
+assert_contains "cat tasks.out" "local-dir-task"
 
 cat <<'TOML' >mise.local.toml
 [task_config]
 includes = ["tasks.local.toml", "local-tasks"]
 TOML
 
-tasks="$(mise tasks ls)"
-assert_output_not_contains "$tasks" "default-task"
-assert_output_not_contains "$tasks" "root-file-task"
-assert_output_not_contains "$tasks" "root-dir-task"
-assert_output_contains "$tasks" "local-file-task"
-assert_output_contains "$tasks" "local-dir-task"
+mise tasks ls >tasks.out
+assert_not_contains "cat tasks.out" "default-task"
+assert_not_contains "cat tasks.out" "root-file-task"
+assert_not_contains "cat tasks.out" "root-dir-task"
+assert_contains "cat tasks.out" "local-file-task"
+assert_contains "cat tasks.out" "local-dir-task"
 
 cat <<'TOML' >mise.toml
 [task_config]
 includes = ["tasks.toml", "root-tasks"]
 includes_mode = "extend"
 TOML
 
-tasks="$(mise tasks ls)"
-assert_output_not_contains "$tasks" "default-task"
-assert_output_not_contains "$tasks" "root-file-task"
-assert_output_not_contains "$tasks" "root-dir-task"
-assert_output_contains "$tasks" "local-file-task"
-assert_output_contains "$tasks" "local-dir-task"
+mise tasks ls >tasks.out
+assert_not_contains "cat tasks.out" "default-task"
+assert_not_contains "cat tasks.out" "root-file-task"
+assert_not_contains "cat tasks.out" "root-dir-task"
+assert_contains "cat tasks.out" "local-file-task"
+assert_contains "cat tasks.out" "local-dir-task"
+
+cat <<'TOML' >mise.local.toml
+[task_config]
+includes = ["tasks.local.toml", "local-tasks"]
+includes_mode = "extend"
+TOML
+
+mise tasks ls >tasks.out
+assert_contains "cat tasks.out" "default-task"
+assert_contains "cat tasks.out" "root-file-task"
+assert_contains "cat tasks.out" "root-dir-task"
+assert_contains "cat tasks.out" "local-file-task"
+assert_contains "cat tasks.out" "local-dir-task"
 
 cat <<'TOML' >mise.toml
 [env]
@@ -132,12 +123,11 @@ includes = ["tasks.local.toml", "local-tasks"]
 includes_mode = "extend"
 TOML
 
-# FIXME: This should be ci + local when the MISE_ENV include precedence bug is fixed.
-tasks="$(MISE_ENV=prod,ci mise tasks ls)"
-assert_output_not_contains "$tasks" "default-task"
-assert_output_not_contains "$tasks" "root-file-task"
-assert_output_not_contains "$tasks" "root-dir-task"
-assert_output_contains "$tasks" "prod-dir-task"
-assert_output_not_contains "$tasks" "ci-dir-task"
-assert_output_contains "$tasks" "local-file-task"
-assert_output_contains "$tasks" "local-dir-task"
+MISE_ENV=prod,ci mise tasks ls >tasks.out
+assert_not_contains "cat tasks.out" "default-task"
+assert_not_contains "cat tasks.out" "root-file-task"
+assert_not_contains "cat tasks.out" "root-dir-task"
+assert_not_contains "cat tasks.out" "prod-dir-task"
+assert_contains "cat tasks.out" "ci-dir-task"
+assert_not_contains "cat tasks.out" "local-file-task"
+assert_not_contains "cat tasks.out" "local-dir-task"

schema/mise.json

@@ -2154,6 +2154,11 @@
             "type": "string"
           },
           "type": "array"
+        },
+        "includes_mode": {
+          "description": "controls whether task_config.includes replaces or extends inherited task includes",
+          "enum": ["replace", "extend"],
+          "type": "string"
         }
       }
     },

src/config/config_file/mod.rs

@@ -612,7 +612,6 @@ impl Hash for dyn ConfigFile {
 pub enum TaskIncludesMode {
     #[default]
     Replace,
-    #[serde(alias = "additive")]
     Extend,
 }
 

src/config/mod.rs

@@ -2409,27 +2409,10 @@ fn selected_task_include_config<'a>(
     configs: &[&'a Arc<dyn ConfigFile>],
     exclude_paths: &[PathBuf],
 ) -> Option<&'a Arc<dyn ConfigFile>> {
-    configs
-        .iter()
-        .copied()
-        .find(|cf| {
-            cf.task_config().includes.is_some()
-                && !exclude_paths.iter().any(|path| cf.get_path() == path)
-                && is_plain_local_config(cf.get_path())
-        })
-        .or_else(|| {
-            configs.iter().copied().find(|cf| {
-                cf.task_config().includes.is_some()
-                    && !exclude_paths.iter().any(|path| cf.get_path() == path)
-            })
-        })
-}
-
-fn is_plain_local_config(path: &Path) -> bool {
-    matches!(
-        path.file_name().and_then(|name| name.to_str()),
-        Some("config.local.toml" | "mise.local.toml" | ".mise.local.toml" | ".rtx.local.toml")
-    )
+    configs.iter().copied().find(|cf| {
+        cf.task_config().includes.is_some()
+            && !exclude_paths.iter().any(|path| cf.get_path() == path)
+    })
 }
 
 fn task_include_specs_for_config(cf: &Arc<dyn ConfigFile>) -> Vec<(PathBuf, String)> {