refactor(ui): action-first flow with immediate save

commands/ui/change.go

@@ -5,6 +5,7 @@ package ui
 
 import (
 	"cmp"
+	"context"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -23,11 +24,12 @@ import (
 	"github.com/terramate-io/terramate/hcl"
 	"github.com/terramate-io/terramate/hcl/ast"
 	"github.com/terramate-io/terramate/project"
+	"github.com/terramate-io/terramate/stdlib"
 	"github.com/terramate-io/terramate/typeschema"
 	"github.com/terramate-io/terramate/yaml"
 )
 
-// ChangeKind indicates the type of pending change.
+// ChangeKind indicates the type of change.
 type ChangeKind string
 
 // ChangeCreate and the following constants enumerate the supported change kinds.
@@ -37,7 +39,7 @@ const (
 	ChangePromote  ChangeKind = "change_promote"
 )
 
-// Change represents a pending change in the summary.
+// Change represents a bundle change (create, reconfigure, or promote).
 type Change struct {
 	Kind        ChangeKind
 	HostPath    string
@@ -62,21 +64,6 @@ type Change struct {
 
 	Warnings []string // Non-fatal warnings surfaced after resolving the change
 
-	// Simple incremental ID returned to the LLM so it can track this change reliably.
-	ProposalID int
-
-	// Set to exclude from uniqueness checks, so an edited change doesn't conflict with itself.
-	MarkedForReplacement bool
-}
-
-// SavedChange is a lightweight summary of a change that was persisted to disk.
-type SavedChange struct {
-	Kind        ChangeKind
-	Name        string
-	EnvID       string
-	FromEnvID   string
-	ProjectPath string
-	HostPath    string
 }
 
 // NewCreateChange builds a Change that represents a new bundle creation.
@@ -90,6 +77,12 @@ func NewCreateChange(
 ) (Change, error) {
 	schemactx = schemactx.ChildContext()
 
+	// Rebind bundle() functions to the current registry so that references
+	// to bundles created during this session (e.g. nested bundles that were
+	// saved immediately) are resolvable.
+	schemactx.Evalctx.SetFunction(stdlib.Name("bundle"), config.BundleFunc(context.TODO(), est.Registry.Registry, activeEnv, false))
+	schemactx.Evalctx.SetFunction(stdlib.Name("bundles"), config.BundlesFunc(est.Registry.Registry, activeEnv))
+
 	// The form may or may not contain values for all defaults.
 	// In this step we re-run input evaluation like it would be done if this was a bundle instance that
 	// has the form values as inputs. This will ensure we get all the inputs.
@@ -188,6 +181,11 @@ func NewReconfigChange(
 ) (Change, error) {
 	schemactx = schemactx.ChildContext()
 
+	// Rebind bundle() functions to the current registry so that references
+	// to bundles created/reconfigured during this session are resolvable.
+	schemactx.Evalctx.SetFunction(stdlib.Name("bundle"), config.BundleFunc(context.TODO(), est.Registry.Registry, bundle.Environment, false))
+	schemactx.Evalctx.SetFunction(stdlib.Name("bundles"), config.BundlesFunc(est.Registry.Registry, bundle.Environment))
+
 	hostPath := bundle.Info.HostPath()
 	projPath := project.PrjAbsPath(est.Root.HostDir(), hostPath).String()
 
@@ -258,6 +256,11 @@ func NewPromoteChange(
 ) (Change, error) {
 	schemactx = schemactx.ChildContext()
 
+	// Rebind bundle() functions to the current registry so that references
+	// to bundles promoted during this session are resolvable.
+	schemactx.Evalctx.SetFunction(stdlib.Name("bundle"), config.BundleFunc(context.TODO(), est.Registry.Registry, env, false))
+	schemactx.Evalctx.SetFunction(stdlib.Name("bundles"), config.BundlesFunc(est.Registry.Registry, env))
+
 	hostPath := bundle.Info.HostPath()
 	projPath := project.PrjAbsPath(est.Root.HostDir(), hostPath).String()
 
@@ -271,13 +274,13 @@ func NewPromoteChange(
 		values,
 	)
 	if err != nil {
-		return Change{}, err
+		return Change{}, wrapMissingBundleRefError(err)
 	}
 
 	// This will only be set if there is an explicit alias.
 	newAlias, err := setupExplicitBundleAlias(schemactx.Evalctx, bde.Define)
 	if err != nil {
-		return Change{}, err
+		return Change{}, wrapMissingBundleRefError(err)
 	}
 
 	var warnings []string
@@ -317,48 +320,6 @@ func NewPromoteChange(
 	}, nil
 }
 
-// NewChangeFromExisting rebuilds a Change from a previously created change with updated values.
-func NewChangeFromExisting(
-	est *EngineState,
-	oldChange Change,
-	schemactx typeschema.EvalContext,
-	inputDefs []*config.InputDefinition,
-	values map[string]cty.Value,
-) (Change, error) {
-	switch oldChange.Kind {
-	case ChangeCreate:
-		return NewCreateChange(
-			est,
-			oldChange.Env,
-			oldChange.BundleDefEntry,
-			schemactx,
-			inputDefs,
-			values,
-		)
-	case ChangeReconfig:
-		return NewReconfigChange(
-			est,
-			oldChange.OriginalBundle,
-			oldChange.BundleDefEntry,
-			schemactx,
-			inputDefs,
-			values,
-		)
-	case ChangePromote:
-		return NewPromoteChange(
-			est,
-			oldChange.Env,
-			oldChange.OriginalBundle,
-			oldChange.BundleDefEntry,
-			schemactx,
-			inputDefs,
-			values,
-		)
-	default:
-		panic("unsupported ChangeKind " + oldChange.Kind)
-	}
-}
-
 // reEvalAllInputs evaluates the bundle's input definitions using the prompted
 // values as a simulated inputs block, filling in defaults for any inputs that
 // were not prompted.
@@ -415,6 +376,17 @@ func reEvalAllInputs(
 	return result, nil
 }
 
+// wrapMissingBundleRefError adds a user-friendly message when a promote/reconfigure
+// fails because a referenced bundle doesn't exist in the target environment.
+// Detects the HCL error pattern for accessing attributes on a null value.
+func wrapMissingBundleRefError(err error) error {
+	msg := err.Error()
+	if strings.Contains(msg, "This value is null") || strings.Contains(msg, "does not have any attributes") {
+		return errors.E(err, "A referenced bundle has not been promoted to this environment yet. Promote dependencies first.")
+	}
+	return err
+}
+
 // Save writes the change to disk as a YAML bundle instance file.
 func (c *Change) Save(envs []*config.Environment) error {
 	var existing *yaml.BundleInstance
@@ -449,6 +421,14 @@ func (c *Change) generateBundleYAML(existing *yaml.BundleInstance, envs []*confi
 			continue
 		}
 
+		// Bundle-ref values are stored as resolved objects internally
+		// but must be written as alias strings in the YAML config.
+		if _, isBundleType := def.Type.(*typeschema.BundleType); isBundleType {
+			if v.IsKnown() && !v.IsNull() && v.Type().IsObjectType() && v.Type().HasAttribute("alias") {
+				v = v.GetAttr("alias")
+			}
+		}
+
 		yv, err := yaml.ConvertFromCty(v)
 		if err != nil {
 			return "", err