Skip to content

fix(task): resolve vars from subdirectory configs for monorepo tasks #8343

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jdx merged 3 commits into from
Feb 25, 2026
Merged

fix(task): resolve vars from subdirectory configs for monorepo tasks #8343

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c45dd9e
fix(task): resolve vars from subdirectory configs for monorepo tasks
jdx Feb 25, 2026
3f3aadd
fix(task): address PR review feedback
jdx Feb 25, 2026
1f08f3e
refactor(task): remove unused parse_usage_spec method
jdx Feb 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 90 additions & 0 deletions e2e/tasks/test_task_monorepo_vars
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
#!/usr/bin/env bash
# Test that monorepo tasks properly load [vars] from subdirectory configs
export MISE_EXPERIMENTAL=1

# Create monorepo root config with vars
cat <<EOF >mise.toml
experimental_monorepo_root = true

[monorepo]
config_roots = ["infra/stacks/*"]

[vars]
ROOT_VAR = "root_value"
SHARED_VAR = "from_root"

[tasks.root-greet]
run = 'echo "ROOT_VAR={{vars.ROOT_VAR}} SHARED_VAR={{vars.SHARED_VAR}}"'
EOF

# Create subdirectory config with its own vars
mkdir -p infra/stacks/gcp
cat <<EOF >infra/stacks/gcp/mise.toml
[vars]
GCP_VAR = "gcp_value"
SHARED_VAR = "from_gcp"

[tasks.greet]
run = 'echo "GCP_VAR={{vars.GCP_VAR}} SHARED_VAR={{vars.SHARED_VAR}} ROOT_VAR={{vars.ROOT_VAR}}"'
EOF

# Create MISE_ENV-specific config for the subdirectory
cat <<EOF >infra/stacks/gcp/mise.dev.toml
[vars]
DEV_VAR = "dev_value"
SHARED_VAR = "from_gcp_dev"
EOF

# Test 1: Root task sees root vars
echo "=== Test 1: Root task sees root vars ==="
unset MISE_ENV
output=$(mise run //:root-greet)
echo "$output"
assert_contains "echo '$output'" "ROOT_VAR=root_value"
assert_contains "echo '$output'" "SHARED_VAR=from_root"

# Test 2: Subdirectory task sees subdirectory vars (the core bug fix)
echo "=== Test 2: Subdirectory task sees subdirectory vars ==="
unset MISE_ENV
output=$(mise run '//infra/stacks/gcp:greet')
echo "$output"
assert_contains "echo '$output'" "GCP_VAR=gcp_value"
assert_contains "echo '$output'" "SHARED_VAR=from_gcp"

# Test 3: Subdirectory task still inherits root vars it doesn't override
echo "=== Test 3: Subdirectory task inherits root vars ==="
unset MISE_ENV
output=$(mise run '//infra/stacks/gcp:greet')
echo "$output"
assert_contains "echo '$output'" "ROOT_VAR=root_value"

# Test 4: Subdirectory vars override root vars of the same name
echo "=== Test 4: Subdirectory vars override root vars ==="
unset MISE_ENV
output=$(mise run '//infra/stacks/gcp:greet')
echo "$output"
# SHARED_VAR should be from_gcp, not from_root
assert_contains "echo '$output'" "SHARED_VAR=from_gcp"

@gemini-code-assist gemini-code-assist Bot Feb 25, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

Tests 2, 3, and 4 each run the same mise run command. For better efficiency and clarity, you could combine these into a single test case that runs the command once and then performs all related assertions.

# Test 2, 3, 4: Subdirectory task var resolution
echo "=== Test 2, 3, 4: Subdirectory task var resolution ==="
unset MISE_ENV
output=$(mise run '//infra/stacks/gcp:greet')
echo "$output"
# Test 2: Subdirectory task sees subdirectory vars (the core bug fix)
assert_contains "echo '$output'" "GCP_VAR=gcp_value"
# Test 4: Subdirectory vars override root vars of the same name
assert_contains "echo '$output'" "SHARED_VAR=from_gcp"
# Test 3: Subdirectory task still inherits root vars it doesn't override
assert_contains "echo '$output'" "ROOT_VAR=root_value"


# Test 5: Subdirectory task with MISE_ENV sees env-specific vars
echo "=== Test 5: MISE_ENV-specific vars in subdirectory ==="
# Add a task that uses the DEV_VAR
cat <<EOF >infra/stacks/gcp/mise.toml
[vars]
GCP_VAR = "gcp_value"
SHARED_VAR = "from_gcp"

[tasks.greet]
run = 'echo "GCP_VAR={{vars.GCP_VAR}} SHARED_VAR={{vars.SHARED_VAR}} ROOT_VAR={{vars.ROOT_VAR}}"'

[tasks.greet-dev]
run = 'echo "DEV_VAR={{vars.DEV_VAR}} SHARED_VAR={{vars.SHARED_VAR}}"'
EOF

@gemini-code-assist gemini-code-assist Bot Feb 25, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

Instead of overwriting the entire mise.toml file, you could append just the new task definition. This would make the test's intent clearer and avoid re-defining existing configuration.

cat <<EOF >>infra/stacks/gcp/mise.toml

[tasks.greet-dev]
run = 'echo "DEV_VAR={{vars.DEV_VAR}} SHARED_VAR={{vars.SHARED_VAR}}"'
EOF


output=$(MISE_ENV=dev mise run '//infra/stacks/gcp:greet-dev')
echo "$output"
assert_contains "echo '$output'" "DEV_VAR=dev_value"
# MISE_ENV vars should override base vars
assert_contains "echo '$output'" "SHARED_VAR=from_gcp_dev"

echo "=== All tests passed! ==="
28 changes: 25 additions & 3 deletions src/task/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,6 +691,17 @@ impl Task {
config: &Arc<Config>,
cwd: Option<PathBuf>,
env: &EnvMap,
) -> Result<(usage::Spec, Vec<String>)> {
self.parse_usage_spec_with_vars(config, cwd, env, None)
.await
}
Comment thread
cursor[bot] marked this conversation as resolved.
Outdated

pub async fn parse_usage_spec_with_vars(
&self,
config: &Arc<Config>,
cwd: Option<PathBuf>,
env: &EnvMap,
extra_vars: Option<IndexMap<String, String>>,
) -> Result<(usage::Spec, Vec<String>)> {
let (mut spec, scripts) = if let Some(file) = self.file_path(config).await? {
let spec = usage::Spec::parse_script(&file)
Expand All @@ -704,7 +715,11 @@ impl Task {
(spec, vec![])
} else {
let scripts_only = self.run_script_strings();
let (scripts, spec) = TaskScriptParser::new(cwd)
let mut parser = TaskScriptParser::new(cwd);
if let Some(vars) = extra_vars {
parser = parser.with_extra_vars(vars);
}
let (scripts, spec) = parser
.parse_run_scripts(config, self, &scripts_only, env)
.await?;
(spec, scripts)
Expand Down Expand Up @@ -741,11 +756,18 @@ impl Task {
cwd: Option<PathBuf>,
args: &[String],
env: &EnvMap,
extra_vars: Option<IndexMap<String, String>>,
) -> Result<Vec<(String, Vec<String>)>> {
let (spec, scripts) = self.parse_usage_spec(config, cwd.clone(), env).await?;
let (spec, scripts) = self
.parse_usage_spec_with_vars(config, cwd.clone(), env, extra_vars.clone())
.await?;
if has_any_args_defined(&spec) {
let scripts_only = self.run_script_strings();
let scripts = TaskScriptParser::new(cwd)
let mut parser = TaskScriptParser::new(cwd);
if let Some(vars) = extra_vars {
parser = parser.with_extra_vars(vars);
}

@gemini-code-assist gemini-code-assist Bot Feb 25, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This logic for creating and configuring the TaskScriptParser is duplicated from parse_usage_spec_with_vars. Consider extracting this into a private helper method on Task to reduce duplication and improve maintainability.

let scripts = parser
.parse_run_scripts_with_args(config, self, &scripts_only, env, args, &spec)
.await?;
Ok(scripts.into_iter().map(|s| (s, vec![])).collect())
Expand Down
124 changes: 85 additions & 39 deletions src/task/task_context_builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::cli::args::ToolArg;
use crate::config::Config;
use crate::config::config_file::ConfigFile;
use crate::config::env_directive::EnvDirective;
use crate::config::env_directive::{EnvDirective, EnvResolveOptions, EnvResults, ToolsFilter};
use crate::env;
use crate::task::Task;
use crate::task::task_helpers::canonicalize_path;
Expand Down Expand Up @@ -133,13 +133,19 @@ impl TaskContextBuilder {

/// Resolve environment variables for a task using its config file context
/// This is used for monorepo tasks to load env vars from subdirectory mise.toml files
/// Returns (env, task_env, resolved_vars) where resolved_vars contains vars from the
/// task's config hierarchy (for injecting into tera context during script rendering)
pub async fn resolve_task_env_with_config(
&self,
config: &Arc<Config>,
task: &Task,
task_cf: &Arc<dyn ConfigFile>,
ts: &Toolset,
) -> Result<(BTreeMap<String, String>, Vec<(String, String)>)> {
) -> Result<(
BTreeMap<String, String>,
Vec<(String, String)>,
Option<IndexMap<String, String>>,
)> {
// Determine if this is a monorepo task (task config differs from current project root)
let is_monorepo_task = task_cf.project_root() != config.project_root;

Expand All @@ -150,27 +156,28 @@ impl TaskContextBuilder {
.and_then(|dir| config.project_root.as_ref().map(|pr| dir == *pr))
.unwrap_or(false);

// Get env entries - load the FULL config hierarchy for monorepo tasks
let all_config_env_entries: Vec<(crate::config::env_directive::EnvDirective, PathBuf)> =
if is_monorepo_task && !task_runs_in_cwd {
// For monorepo tasks that DON'T run in cwd: Load config hierarchy from the task's directory
// This includes parent configs AND MISE_ENV-specific configs
let task_dir = task_cf.get_path().parent().unwrap_or(task_cf.get_path());
// Load task config files for monorepo tasks (reused for both vars and env resolution)
let task_config_files = if is_monorepo_task && !task_runs_in_cwd {
let task_dir = task_cf.get_path().parent().unwrap_or(task_cf.get_path());

trace!(
"Loading config hierarchy for monorepo task {} from {}",
task.name,
task_dir.display()
);
trace!(
"Loading config hierarchy for monorepo task {} from {}",
task.name,
task_dir.display()
);

// Load all config files in the hierarchy
let config_paths = crate::config::load_config_hierarchy_from_dir(task_dir)?;
trace!("Found {} config files in hierarchy", config_paths.len());
let config_paths = crate::config::load_config_hierarchy_from_dir(task_dir)?;
trace!("Found {} config files in hierarchy", config_paths.len());

let task_config_files =
crate::config::load_config_files_from_paths(&config_paths).await?;
Some(crate::config::load_config_files_from_paths(&config_paths).await?)
} else {
None
};

// Extract env entries from all config files
// Get env entries - load the FULL config hierarchy for monorepo tasks
let all_config_env_entries: Vec<(EnvDirective, PathBuf)> =
if let Some(ref task_config_files) = task_config_files {
// Extract env entries from all config files in the task's hierarchy
task_config_files
.iter()
.rev()
Expand Down Expand Up @@ -202,7 +209,8 @@ impl TaskContextBuilder {
// Check using task_cf entries for compatibility with existing logic
let task_cf_env_entries = task_cf.env_entries()?;
if self.should_use_standard_env_resolution(task, task_cf, config, &task_cf_env_entries) {
return task.render_env(config, ts).await;
let (env, task_env) = task.render_env(config, ts).await?;
return Ok((env, task_env, None));
}

let config_path = canonicalize_path(task_cf.get_path());
Expand All @@ -219,12 +227,15 @@ impl TaskContextBuilder {
task.name,
config_path.display()
);
return Ok(cached_env.clone());
let (env, task_env) = cached_env.clone();
return Ok((env, task_env, None));
Comment thread
cursor[bot] marked this conversation as resolved.
Outdated
}
}

let mut env = ts.full_env(config).await?;
let tera_ctx = self.build_tera_context(task_cf, ts, config).await?;
let (tera_ctx, resolved_vars) = self
.build_tera_context(task_cf, ts, config, task_config_files.as_ref())
.await?;

// Resolve config-level env from ALL config files, not just task_cf
let config_env_results = self
Expand Down Expand Up @@ -257,7 +268,7 @@ impl TaskContextBuilder {
});
}

Ok((env, task_env))
Ok((env, task_env, resolved_vars))
}

/// Check if standard env resolution should be used instead of special context
Expand All @@ -283,17 +294,59 @@ impl TaskContextBuilder {
}

/// Build tera context with config_root for monorepo tasks
/// If task_config_files is provided, resolves vars from the task's config hierarchy
/// and merges them into the tera context so env directives can reference {{ vars.X }}
/// Returns (tera_context, resolved_vars) where resolved_vars is Some if task-specific
/// vars were resolved (for passing to script rendering)
async fn build_tera_context(
&self,
task_cf: &Arc<dyn ConfigFile>,
ts: &Toolset,
config: &Arc<Config>,
) -> Result<tera::Context> {
task_config_files: Option<&IndexMap<PathBuf, Arc<dyn ConfigFile>>>,
) -> Result<(tera::Context, Option<IndexMap<String, String>>)> {
let mut tera_ctx = ts.tera_ctx(config).await?.clone();
if let Some(root) = task_cf.project_root() {
tera_ctx.insert("config_root", &root);
}
Ok(tera_ctx)
let mut resolved_vars = None;
// If we have task-specific config files, resolve vars from them
if let Some(task_config_files) = task_config_files {
let vars_entries: Vec<(EnvDirective, PathBuf)> = task_config_files
.iter()
.rev()
.map(|(source, cf)| {
cf.vars_entries()
.map(|ee| ee.into_iter().map(|e| (e, source.clone())))
})
.collect::<Result<Vec<_>>>()?
.into_iter()
.flatten()
.collect();

if !vars_entries.is_empty() {
let vars_results = EnvResults::resolve(
config,
tera_ctx.clone(),
&env::PRISTINE_ENV,
vars_entries,
EnvResolveOptions {
vars: true,
tools: ToolsFilter::NonToolsOnly,
warn_on_missing_required: false,
},
)
.await?;
// Merge task vars with existing global vars
let mut vars: IndexMap<String, String> = config.vars.clone();
for (k, (v, _)) in &vars_results.vars {
vars.insert(k.clone(), v.clone());
}
tera_ctx.insert("vars", &vars);
resolved_vars = Some(vars);
}
}
Ok((tera_ctx, resolved_vars))
}

/// Build env directives from task-specific env (including inherited env)
Expand All @@ -314,8 +367,7 @@ impl TaskContextBuilder {
tera_ctx: &tera::Context,
env: &BTreeMap<String, String>,
directives: Vec<(EnvDirective, PathBuf)>,
) -> Result<crate::config::env_directive::EnvResults> {
use crate::config::env_directive::{EnvResolveOptions, EnvResults, ToolsFilter};
) -> Result<EnvResults> {
EnvResults::resolve(
config,
tera_ctx.clone(),
Expand All @@ -331,10 +383,7 @@ impl TaskContextBuilder {
}

/// Extract task env from EnvResults (only task-specific directives)
fn extract_task_env(
&self,
task_env_results: &crate::config::env_directive::EnvResults,
) -> Vec<(String, String)> {
fn extract_task_env(&self, task_env_results: &EnvResults) -> Vec<(String, String)> {
task_env_results
.env
.iter()
Expand All @@ -344,10 +393,7 @@ impl TaskContextBuilder {

/// Apply EnvResults to an environment map
/// Handles env vars, env_remove, and env_paths (PATH modifications)
fn apply_env_results(
env: &mut BTreeMap<String, String>,
results: &crate::config::env_directive::EnvResults,
) {
fn apply_env_results(env: &mut BTreeMap<String, String>, results: &EnvResults) {
// Apply environment variables
for (k, (v, _)) in &results.env {
env.insert(k.clone(), v.clone());
Expand Down Expand Up @@ -402,7 +448,7 @@ mod tests {
let mut env = BTreeMap::new();
env.insert("EXISTING".to_string(), "value".to_string());

let mut results = crate::config::env_directive::EnvResults::default();
let mut results = EnvResults::default();
results.env.insert(
"NEW_VAR".to_string(),
("new_value".to_string(), PathBuf::from("/test")),
Expand All @@ -420,7 +466,7 @@ mod tests {
env.insert("TO_REMOVE".to_string(), "value".to_string());
env.insert("TO_KEEP".to_string(), "value".to_string());

let mut results = crate::config::env_directive::EnvResults::default();
let mut results = EnvResults::default();
results.env_remove.insert("TO_REMOVE".to_string());

TaskContextBuilder::apply_env_results(&mut env, &results);
Expand All @@ -434,7 +480,7 @@ mod tests {
let mut env = BTreeMap::new();
env.insert(env::PATH_KEY.to_string(), "/existing/path".to_string());

let mut results = crate::config::env_directive::EnvResults::default();
let mut results = EnvResults::default();
results
.env_paths
.push(PathBuf::from("/new/path").to_path_buf());
Expand All @@ -448,7 +494,7 @@ mod tests {
#[test]
fn test_extract_task_env() {
let builder = TaskContextBuilder::new();
let mut results = crate::config::env_directive::EnvResults::default();
let mut results = EnvResults::default();
results.env.insert(
"VAR1".to_string(),
("value1".to_string(), PathBuf::from("/test")),
Expand Down
Loading
Loading