refactor: Create new "context" manager

.vscode/launch.json

@@ -25,7 +25,7 @@
       "request": "launch",
       "mode": "auto",
       "program": "${workspaceFolder}/cmd/windsor/main.go",
-      "args": ["init", "local"]
+      "args": ["init", "local"],
     },
     {
       "name": "Windsor Up",

cmd/build_id_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/windsorcli/cli/pkg/di"
-	"github.com/windsorcli/cli/pkg/shell"
+	"github.com/windsorcli/cli/pkg/context/shell"
 )
 
 func TestBuildIDCmd(t *testing.T) {

cmd/bundle_test.go

@@ -9,12 +9,12 @@ import (
 	"testing"
 
 	"github.com/spf13/cobra"
-	"github.com/windsorcli/cli/pkg/config"
+	"github.com/windsorcli/cli/pkg/context/config"
 	"github.com/windsorcli/cli/pkg/di"
 	"github.com/windsorcli/cli/pkg/infrastructure/kubernetes"
 	"github.com/windsorcli/cli/pkg/resources/artifact"
 	"github.com/windsorcli/cli/pkg/resources/blueprint"
-	"github.com/windsorcli/cli/pkg/shell"
+	"github.com/windsorcli/cli/pkg/context/shell"
 )
 
 // =============================================================================

cmd/down_test.go

@@ -8,10 +8,10 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-	"github.com/windsorcli/cli/pkg/config"
+	"github.com/windsorcli/cli/pkg/context/config"
 	"github.com/windsorcli/cli/pkg/di"
 	"github.com/windsorcli/cli/pkg/pipelines"
-	"github.com/windsorcli/cli/pkg/shell"
+	"github.com/windsorcli/cli/pkg/context/shell"
 )
 
 // =============================================================================

cmd/init.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	"github.com/spf13/cobra"
-	"github.com/windsorcli/cli/pkg/config"
+	"github.com/windsorcli/cli/pkg/context/config"
 	"github.com/windsorcli/cli/pkg/di"
 	"github.com/windsorcli/cli/pkg/pipelines"
 	"github.com/windsorcli/cli/pkg/runtime"

cmd/init_test.go

@@ -9,11 +9,11 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-	"github.com/windsorcli/cli/pkg/config"
+	"github.com/windsorcli/cli/pkg/context/config"
 	"github.com/windsorcli/cli/pkg/constants"
 	"github.com/windsorcli/cli/pkg/di"
 	"github.com/windsorcli/cli/pkg/pipelines"
-	"github.com/windsorcli/cli/pkg/shell"
+	"github.com/windsorcli/cli/pkg/context/shell"
 )
 
 // =============================================================================

cmd/push_test.go

@@ -9,12 +9,12 @@ import (
 	"testing"
 
 	"github.com/spf13/cobra"
-	"github.com/windsorcli/cli/pkg/config"
+	"github.com/windsorcli/cli/pkg/context/config"
 	"github.com/windsorcli/cli/pkg/di"
 	"github.com/windsorcli/cli/pkg/infrastructure/kubernetes"
 	"github.com/windsorcli/cli/pkg/resources/artifact"
 	"github.com/windsorcli/cli/pkg/resources/blueprint"
-	"github.com/windsorcli/cli/pkg/shell"
+	"github.com/windsorcli/cli/pkg/context/shell"
 )
 
 // =============================================================================

cmd/root_test.go

@@ -13,13 +13,13 @@ import (
 	"testing"
 
 	"github.com/spf13/cobra"
-	"github.com/windsorcli/cli/pkg/config"
+	"github.com/windsorcli/cli/pkg/context/config"
 	"github.com/windsorcli/cli/pkg/di"
-	"github.com/windsorcli/cli/pkg/environment/envvars"
+	envvars "github.com/windsorcli/cli/pkg/context/env"
 	"github.com/windsorcli/cli/pkg/infrastructure/kubernetes"
 	blueprintpkg "github.com/windsorcli/cli/pkg/resources/blueprint"
-	"github.com/windsorcli/cli/pkg/secrets"
-	"github.com/windsorcli/cli/pkg/shell"
+	"github.com/windsorcli/cli/pkg/context/secrets"
+	"github.com/windsorcli/cli/pkg/context/shell"
 )
 
 // =============================================================================

cmd/up_test.go

@@ -9,10 +9,10 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-	"github.com/windsorcli/cli/pkg/config"
+	"github.com/windsorcli/cli/pkg/context/config"
 	"github.com/windsorcli/cli/pkg/di"
 	"github.com/windsorcli/cli/pkg/pipelines"
-	"github.com/windsorcli/cli/pkg/shell"
+	"github.com/windsorcli/cli/pkg/context/shell"
 )
 
 // =============================================================================

pkg/config/config_handler.go → pkg/context/config/config_handler.go

@@ -9,8 +9,8 @@ import (
 	"strings"
 
 	"github.com/windsorcli/cli/api/v1alpha1"
+	"github.com/windsorcli/cli/pkg/context/shell"
 	"github.com/windsorcli/cli/pkg/di"
-	"github.com/windsorcli/cli/pkg/shell"
 )
 
 // The ConfigHandler is a core component that manages configuration state and context across the application.
@@ -61,6 +61,7 @@ type configHandler struct {
 	shims           *Shims
 	schemaValidator *SchemaValidator
 	data            map[string]any
+	defaultConfig   *v1alpha1.Context
 }
 
 // =============================================================================
@@ -323,7 +324,30 @@ func (c *configHandler) SaveConfig(overwrite ...bool) error {
 		}
 
 		if !contextExists || shouldOverwrite {
-			contextStruct := c.mapToContext(staticFields)
+			var contextStruct *v1alpha1.Context
+			if !contextExists && c.defaultConfig != nil {
+				defaultCopy := c.defaultConfig.DeepCopy()
+				if len(staticFields) > 0 {
+					overlayStruct := c.mapToContext(staticFields)
+					if overlayStruct != nil {
+						defaultCopy.Merge(overlayStruct)
+					}
+				}
+				contextStruct = defaultCopy
+			} else {
+				mergedStaticFields := staticFields
+				if c.schemaValidator != nil && c.schemaValidator.Schema != nil {
+					defaults, err := c.schemaValidator.GetSchemaDefaults()
+					if err == nil && defaults != nil {
+						defaultsStatic, _ := c.separateStaticAndDynamicFields(defaults)
+						mergedStaticFields = c.deepMerge(defaultsStatic, staticFields)
+					}
+				}
+				contextStruct = c.mapToContext(mergedStaticFields)
+			}
+			if contextStruct == nil {
+				contextStruct = &v1alpha1.Context{}
+			}
 			data, err := c.shims.YamlMarshal(contextStruct)
 			if err != nil {
 				return fmt.Errorf("error marshalling context config: %w", err)
@@ -353,6 +377,8 @@ func (c *configHandler) SaveConfig(overwrite ...bool) error {
 // SetDefault sets the default context configuration in the config handler's internal data.
 // It marshals the given v1alpha1.Context struct to a map and merges it into the handler's data.
 // This method is typically used during initialization when context files do not yet exist.
+// The original default config is stored so it can be used when saving a new config file to ensure
+// all default values are preserved even if they were empty/nil (which would be omitted by omitempty tags).
 func (c *configHandler) SetDefault(context v1alpha1.Context) error {
 	contextData, err := c.shims.YamlMarshal(context)
 	if err != nil {
@@ -365,6 +391,10 @@ func (c *configHandler) SetDefault(context v1alpha1.Context) error {
 	}
 
 	c.data = c.deepMerge(c.data, contextMap)
+
+	contextCopy := context
+	c.defaultConfig = &contextCopy
+
 	return nil
 }
 
@@ -735,6 +765,8 @@ func (c *configHandler) LoadSchemaFromBytes(schemaContent []byte) error {
 // The result provides all configuration values, with schema defaults filled in for missing keys, ensuring
 // downstream consumers (such as blueprint processing) always receive a complete set of config values.
 // If the schema validator or schema is unavailable, only the currently loaded data is returned.
+// It also ensures that cluster.controlplanes.nodes and cluster.workers.nodes are initialized as empty maps
+// even though they are not serialized to YAML, so template expressions can safely evaluate them.
 func (c *configHandler) GetContextValues() (map[string]any, error) {
 	result := make(map[string]any)
 	if c.schemaValidator != nil && c.schemaValidator.Schema != nil {
@@ -744,6 +776,43 @@ func (c *configHandler) GetContextValues() (map[string]any, error) {
 		}
 	}
 	result = c.deepMerge(result, c.data)
+
+	clusterVal, ok := result["cluster"].(map[string]any)
+	if !ok {
+		if _, exists := result["cluster"]; !exists || result["cluster"] == nil {
+			result["cluster"] = map[string]any{
+				"controlplanes": map[string]any{
+					"nodes": make(map[string]any),
+				},
+				"workers": map[string]any{
+					"nodes": make(map[string]any),
+				},
+			}
+			return result, nil
+		}
+		return result, nil
+	}
+
+	if controlplanesVal, ok := clusterVal["controlplanes"].(map[string]any); ok {
+		if _, exists := controlplanesVal["nodes"]; !exists {
+			controlplanesVal["nodes"] = make(map[string]any)
+		}
+	} else {
+		clusterVal["controlplanes"] = map[string]any{
+			"nodes": make(map[string]any),
+		}
+	}
+
+	if workersVal, ok := clusterVal["workers"].(map[string]any); ok {
+		if _, exists := workersVal["nodes"]; !exists {
+			workersVal["nodes"] = make(map[string]any)
+		}
+	} else {
+		clusterVal["workers"] = map[string]any{
+			"nodes": make(map[string]any),
+		}
+	}
+
 	return result, nil
 }
 

pkg/config/config_handler_private_test.go → pkg/context/config/config_handler_private_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/windsorcli/cli/pkg/di"
-	"github.com/windsorcli/cli/pkg/shell"
+	"github.com/windsorcli/cli/pkg/context/shell"
 )
 
 // =============================================================================

pkg/config/config_handler_public_test.go → pkg/context/config/config_handler_public_test.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/windsorcli/cli/api/v1alpha1"
 	"github.com/windsorcli/cli/pkg/di"
-	"github.com/windsorcli/cli/pkg/shell"
+	"github.com/windsorcli/cli/pkg/context/shell"
 )
 
 // =============================================================================

pkg/config/schema_validator.go → pkg/context/config/schema_validator.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/goccy/go-yaml"
-	"github.com/windsorcli/cli/pkg/shell"
+	"github.com/windsorcli/cli/pkg/context/shell"
 )
 
 // The SchemaValidator is a JSON Schema validation component for Windsor blueprints.

pkg/config/schema_validator_test.go → pkg/context/config/schema_validator_test.go

@@ -4,7 +4,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/windsorcli/cli/pkg/shell"
+	"github.com/windsorcli/cli/pkg/context/shell"
 )
 
 // The SchemaValidatorTest is a comprehensive test suite for the SchemaValidator component.