fix: avoid clobbering sh: vars when resolving global Ref values

compiler.go

@@ -115,7 +115,13 @@ func (c *Compiler) getVariables(t *ast.Task, call *Call, evaluateShVars bool) (*
 		}
 	}
 	// Resolve any outstanding 'Ref' values in global vars (esp. globals from imported Taskfiles).
-	c.TaskfileVars = templater.ReplaceVars(c.TaskfileVars, &templater.Cache{Vars: result})
+	// Only process variables with Ref set to avoid clobbering already-resolved sh: variables.
+	cache := &templater.Cache{Vars: result}
+	for k, v := range c.TaskfileVars.All() {
+		if v.Ref != "" {
+			c.TaskfileVars.Set(k, ast.Var{Value: templater.ResolveRef(v.Ref, cache)})
+		}
+	}
 
 	if t != nil {
 		for k, v := range t.IncludeVars.All() {

executor_test.go

@@ -946,6 +946,32 @@ func TestReference(t *testing.T) {
 	}
 }
 
+func TestShVarWithIncludes(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		name string
+		call string
+	}{
+		{
+			name: "sh var not clobbered by includes",
+			call: "default",
+		},
+	}
+
+	for _, test := range tests {
+		NewExecutorTest(t,
+			WithName(test.name),
+			WithExecutorOptions(
+				task.WithDir("testdata/var_sh_with_includes"),
+				task.WithSilent(true),
+				task.WithForce(true),
+			),
+			WithTask(cmp.Or(test.call, "default")),
+		)
+	}
+}
+
 func TestVarInheritance(t *testing.T) {
 	enableExperimentForTest(t, &experiments.EnvPrecedence, 1)
 	tests := []struct {

testdata/var_sh_with_includes/Included.yml

@@ -0,0 +1,6 @@
+version: '3'
+
+tasks:
+  noop:
+    cmds:
+      - "true"

testdata/var_sh_with_includes/Taskfile.yml

@@ -0,0 +1,18 @@
+version: '3'
+
+includes:
+  other:
+    taskfile: ./Included.yml
+    internal: true
+
+vars:
+  DYNAMIC_VAR:
+    sh: echo "hello"
+  DERIVED_VAR: "{{.DYNAMIC_VAR}} world"
+
+tasks:
+  default:
+    cmds:
+      - echo "DYNAMIC_VAR={{.DYNAMIC_VAR}}"
+      - echo "DERIVED_VAR={{.DERIVED_VAR}}"
+    silent: true

testdata/var_sh_with_includes/testdata/TestShVarWithIncludes-sh_var_not_clobbered_by_includes.golden

@@ -0,0 +1,2 @@
+DYNAMIC_VAR=hello
+DERIVED_VAR=hello world