Handle typos in the synthetic "var" prefix

When the first segment is close to "var" (e.g., "vr", "va"), rewrite
to variables.X.value and suggest through the normal path. This handles
cases like ${vr.my_cluster_id} → ${var.my_cluster_id}.

Co-authored-by: Isaac

Author: shreyas-goenka

bundle/config/mutator/suggest.go

@@ -146,7 +146,16 @@ func (m *resolveVariableReferences) suggest(
 	}
 
 	// Handle var.X → variables.X.value rewriting for internal lookup.
+	// Also detect typos in the "var" prefix itself (e.g., "vr", "va").
 	isVar := path.HasPrefix(varPath)
+	varPrefixCorrected := false
+	if !isVar && len(path) >= 2 {
+		if c, _ := closestMatch(path[0].Key(), []string{"var"}); c != "" {
+			isVar = true
+			varPrefixCorrected = true
+		}
+	}
+
 	if isVar {
 		newPath := dyn.NewPath(dyn.Key("variables"), path[1], dyn.Key("value"))
 		if len(path) > 2 {
@@ -162,6 +171,15 @@ func (m *resolveVariableReferences) suggest(
 	}
 
 	suggestion := suggestPath(segments, normalized)
+
+	// If suggestPath found no deeper fixes but the var prefix itself was
+	// corrected, verify the rewritten path is valid and use it.
+	if suggestion == "" && varPrefixCorrected {
+		if _, err := dyn.GetByPath(normalized, path); err == nil {
+			suggestion = path.String()
+		}
+	}
+
 	if suggestion == "" {
 		return ""
 	}

bundle/config/mutator/suggest_test.go

@@ -218,6 +218,32 @@ func TestSuggestVarRewriting(t *testing.T) {
 	require.Equal(t, "var.my_cluster_id", suggestion)
 }
 
+func TestSuggestVarPrefixTypo(t *testing.T) {
+	normalized := dyn.V(map[string]dyn.Value{
+		"variables": dyn.V(map[string]dyn.Value{
+			"my_cluster_id": dyn.V(map[string]dyn.Value{
+				"value": dyn.V("abc-123"),
+			}),
+		}),
+	})
+
+	m := &resolveVariableReferences{
+		prefixes: defaultPrefixes,
+	}
+
+	prefixes := []dyn.Path{dyn.MustPathFromString("variables")}
+	varPath := dyn.NewPath(dyn.Key("var"))
+
+	// Typo in var prefix only, variable name is correct.
+	assert.Equal(t, "var.my_cluster_id", m.suggest("vr.my_cluster_id", normalized, prefixes, varPath))
+
+	// Typo in var prefix AND variable name.
+	assert.Equal(t, "var.my_cluster_id", m.suggest("vr.my_clster_id", normalized, prefixes, varPath))
+
+	// Var prefix typo but no matching variable.
+	assert.Equal(t, "", m.suggest("vr.nonexistent", normalized, prefixes, varPath))
+}
+
 func TestSuggestNoSuggestionForCorrectPath(t *testing.T) {
 	normalized := dyn.V(map[string]dyn.Value{
 		"variables": dyn.V(map[string]dyn.Value{