addressed feedback requests

Author: savil

internal/boxcli/run.go

@@ -123,18 +123,18 @@ func runScriptCmd(cmd *cobra.Command, args []string, flags runCmdFlags) error {
 		return redact.Errorf("error reading devbox.json: %w", err)
 	}
 
-	onStaleState := func() {
-		ux.FHidableWarning(
-			ctx,
-			cmd.ErrOrStderr(),
-			devbox.StateOutOfDateMessage,
-			"with --recompute=true",
-		)
-	}
-
 	envOpts := devopt.EnvOptions{
-		Hooks: devopt.EnvLifecycleHooks{
-			OnStaleStateWithSkipRecompute: onStaleState,
+		Hooks: devopt.LifecycleHooks{
+			OnStaleState: func() {
+				if !flags.recomputeEnv {
+					ux.FHidableWarning(
+						ctx,
+						cmd.ErrOrStderr(),
+						devbox.StateOutOfDateMessage,
+						"with --recompute=true",
+					)
+				}
+			},
 		},
 		OmitNixEnv:    flags.omitNixEnv,
 		Pure:          flags.pure,

internal/boxcli/shell.go

@@ -96,18 +96,18 @@ func runShellCmd(cmd *cobra.Command, flags shellCmdFlags) error {
 		return shellInceptionErrorMsg("devbox shell")
 	}
 
-	onStaleState := func() {
-		ux.FHidableWarning(
-			ctx,
-			cmd.ErrOrStderr(),
-			devbox.StateOutOfDateMessage,
-			"with --recompute=true",
-		)
-	}
-
 	return box.Shell(ctx, devopt.EnvOptions{
-		Hooks: devopt.EnvLifecycleHooks{
-			OnStaleStateWithSkipRecompute: onStaleState,
+		Hooks: devopt.LifecycleHooks{
+			OnStaleState: func() {
+				if !flags.recomputeEnv {
+					ux.FHidableWarning(
+						ctx,
+						cmd.ErrOrStderr(),
+						devbox.StateOutOfDateMessage,
+						"with --recompute=true",
+					)
+				}
+			},
 		},
 		OmitNixEnv:    flags.omitNixEnv,
 		Pure:          flags.pure,

internal/boxcli/shellenv.go

@@ -115,19 +115,19 @@ func shellEnvFunc(
 		}
 	}
 
-	onStaleState := func() {
-		ux.FHidableWarning(
-			ctx,
-			cmd.ErrOrStderr(),
-			devbox.StateOutOfDateMessage,
-			box.RefreshAliasOrCommand(),
-		)
-	}
-
 	envStr, err := box.EnvExports(ctx, devopt.EnvExportsOpts{
 		EnvOptions: devopt.EnvOptions{
-			Hooks: devopt.EnvLifecycleHooks{
-				OnStaleStateWithSkipRecompute: onStaleState,
+			Hooks: devopt.LifecycleHooks{
+				OnStaleState: func() {
+					if !flags.recomputeEnv {
+						ux.FHidableWarning(
+							ctx,
+							cmd.ErrOrStderr(),
+							devbox.StateOutOfDateMessage,
+							box.RefreshAliasOrCommand(),
+						)
+					}
+				},
 			},
 			OmitNixEnv:        flags.omitNixEnv,
 			PreservePathStack: flags.preservePathStack,

internal/devbox/devbox.go

@@ -804,14 +804,17 @@ func (d *Devbox) ensureStateIsUpToDateAndComputeEnv(
 ) (map[string]string, error) {
 	defer debug.FunctionTimer().End()
 
-	if envOpts.SkipRecompute {
-		upToDate, _ := d.lockfile.IsUpToDateAndInstalled(isFishShell())
-		if !upToDate {
-			if envOpts.Hooks.OnStaleStateWithSkipRecompute != nil {
-				envOpts.Hooks.OnStaleStateWithSkipRecompute()
-			}
+	upToDate, err := d.lockfile.IsUpToDateAndInstalled(isFishShell())
+	if err != nil {
+		return nil, err
+	}
+	if !upToDate {
+		if envOpts.Hooks.OnStaleState != nil {
+			envOpts.Hooks.OnStaleState()
 		}
-	} else {
+	}
+
+	if !envOpts.SkipRecompute {
 		// When ensureStateIsUpToDate is called with ensure=true, it always
 		// returns early if the lockfile is up to date. So we don't need to check here
 		if err := d.ensureStateIsUpToDate(ctx, ensure); isConnectionError(err) {

internal/devbox/devopt/devboxopts.go

@@ -72,14 +72,14 @@ type EnvExportsOpts struct {
 // like `shellenv`, `shell` and `run`.
 // - The struct is designed for the "common case" to be zero-initialized as `EnvOptions{}`.
 type EnvOptions struct {
-	Hooks             EnvLifecycleHooks
+	Hooks             LifecycleHooks
 	OmitNixEnv        bool
 	PreservePathStack bool
 	Pure              bool
 	SkipRecompute     bool
 }
 
-type EnvLifecycleHooks struct {
-	// OnStaleStateWithSkipRecompute is called when the Devbox state is out of date, AND it is not being recomputed.
-	OnStaleStateWithSkipRecompute func()
+type LifecycleHooks struct {
+	// OnStaleState is called when the Devbox state is out of date, AND it is not being recomputed.
+	OnStaleState func()
 }