wip: fix: deploy status

#478

.drone.yml

@@ -10,7 +10,7 @@ steps:
   - name: make test
     image: golang:1.22
     environment:
-      CATL_URL: https://git.coopcloud.tech/coop-cloud/recipes-catalogue-json.git
+      CATL_URL: https://git.coopcloud.tech/toolshed/recipes-catalogue-json.git
     commands:
       - mkdir -p $HOME/.abra
       - git clone $CATL_URL $HOME/.abra/catalogue
@@ -29,7 +29,7 @@ steps:
       event: tag
 
   - name: release
-    image: goreleaser/goreleaser:v1.24.0
+    image: goreleaser/goreleaser:v2.5.1
     environment:
       GITEA_TOKEN:
         from_secret: goreleaser_gitea_token
@@ -47,10 +47,10 @@ steps:
     image: plugins/docker
     settings:
       auto_tag: true
-      username: 3wordchant
+      username: abra-bot
       password:
-        from_secret: git_coopcloud_tech_token_3wc
-      repo: git.coopcloud.tech/coop-cloud/abra
+        from_secret: git_coopcloud_tech_token_abra_bot
+      repo: git.coopcloud.tech/toolshed/abra
       tags: dev
       registry: git.coopcloud.tech
     when:
@@ -74,7 +74,7 @@ steps:
       request_pty: true
       script:
         - |
-          wget https://git.coopcloud.tech/coop-cloud/abra/raw/branch/main/scripts/tests/run-ci-int -O run-ci-int
+          wget https://git.coopcloud.tech/toolshed/abra/raw/branch/main/scripts/tests/run-ci-int -O run-ci-int
           chmod +x run-ci-int
           sh run-ci-int
     when:

.gitea/ISSUE_TEMPLATE.md

@@ -1,8 +0,0 @@
----
-name: "Do not use this issue tracker"
-about: "Do not use this issue tracker"
-title: "Do not use this issue tracker"
-labels: []
----
-
-Please report your issue on [`coop-cloud/organising`](https://git.coopcloud.tech/coop-cloud/organising)

AUTHORS.md

@@ -4,6 +4,7 @@
 > please do add yourself! This is a community project, let's show some 💞
 
 - 3wordchant
+- ammaratef45
 - cassowary
 - codegod100
 - decentral1se
@@ -17,3 +18,5 @@
 - roxxers
 - vera
 - yksflip
+- basebuilder
+- mayel

Dockerfile

@@ -1,7 +1,7 @@
 # Build image
 FROM golang:1.22-alpine AS build
 
-ENV GOPRIVATE coopcloud.tech
+ENV GOPRIVATE=coopcloud.tech
 
 RUN apk add --no-cache \
   gcc \

README.md

@@ -1,7 +1,7 @@
 # `abra`
 
-[![Build Status](https://build.coopcloud.tech/api/badges/coop-cloud/abra/status.svg?ref=refs/heads/main)](https://build.coopcloud.tech/coop-cloud/abra)
-[![Go Report Card](https://goreportcard.com/badge/git.coopcloud.tech/coop-cloud/abra)](https://goreportcard.com/report/git.coopcloud.tech/coop-cloud/abra)
+[![Build Status](https://build.coopcloud.tech/api/badges/toolshed/abra/status.svg?ref=refs/heads/main)](https://build.coopcloud.tech/toolshed/abra)
+[![Go Report Card](https://goreportcard.com/badge/git.coopcloud.tech/toolshed/abra)](https://goreportcard.com/report/git.coopcloud.tech/toolshed/abra)
 [![Go Reference](https://pkg.go.dev/badge/coopcloud.tech/abra.svg)](https://pkg.go.dev/coopcloud.tech/abra)
 
 The Co-op Cloud utility belt 🎩🐇

cli/app/backup.go

@@ -11,7 +11,7 @@ import (
 )
 
 var AppBackupListCommand = &cobra.Command{
-	Use:     "list <app> [flags]",
+	Use:     "list <domain> [flags]",
 	Aliases: []string{"ls"},
 	Short:   "List the contents of a snapshot",
 	Args:    cobra.ExactArgs(1),
@@ -61,7 +61,7 @@ var AppBackupListCommand = &cobra.Command{
 }
 
 var AppBackupDownloadCommand = &cobra.Command{
-	Use:     "download <app> [flags]",
+	Use:     "download <domain> [flags]",
 	Aliases: []string{"d"},
 	Short:   "Download a snapshot",
 	Long: `Downloads a backup.tar.gz to the current working directory.
@@ -78,7 +78,7 @@ var AppBackupDownloadCommand = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		app := internal.ValidateApp(args)
 
-		if err := app.Recipe.Ensure(internal.Chaos, internal.Offline); err != nil {
+		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
 			log.Fatal(err)
 		}
 
@@ -130,7 +130,7 @@ var AppBackupDownloadCommand = &cobra.Command{
 }
 
 var AppBackupCreateCommand = &cobra.Command{
-	Use:     "create <app> [flags]",
+	Use:     "create <domain> [flags]",
 	Aliases: []string{"c"},
 	Short:   "Create a new snapshot",
 	Args:    cobra.ExactArgs(1),
@@ -143,7 +143,7 @@ var AppBackupCreateCommand = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		app := internal.ValidateApp(args)
 
-		if err := app.Recipe.Ensure(internal.Chaos, internal.Offline); err != nil {
+		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
 			log.Fatal(err)
 		}
 
@@ -174,7 +174,7 @@ var AppBackupCreateCommand = &cobra.Command{
 }
 
 var AppBackupSnapshotsCommand = &cobra.Command{
-	Use:     "snapshots <app> [flags]",
+	Use:     "snapshots <domain> [flags]",
 	Aliases: []string{"s"},
 	Short:   "List all snapshots",
 	Args:    cobra.ExactArgs(1),

cli/app/check.go

@@ -13,7 +13,7 @@ import (
 )
 
 var AppCheckCommand = &cobra.Command{
-	Use:     "check <app> [flags]",
+	Use:     "check <domain> [flags]",
 	Aliases: []string{"chk"},
 	Short:   "Ensure an app is well configured",
 	Long: `Compare env vars in both the app ".env" and recipe ".env.sample" file.
@@ -36,7 +36,7 @@ ${FOO:<default>} syntax). "check" does not confirm or deny this for you.`,
 	Run: func(cmd *cobra.Command, args []string) {
 		app := internal.ValidateApp(args)
 
-		if err := app.Recipe.Ensure(internal.Chaos, internal.Offline); err != nil {
+		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
 			log.Fatal(err)
 		}
 

cli/app/cmd.go

@@ -18,7 +18,7 @@ import (
 )
 
 var AppCmdCommand = &cobra.Command{
-	Use:     "command <app> [service | --local] <cmd> [[args] [flags] | [flags] -- [args]]",
+	Use:     "command <domain> [service | --local] <cmd> [[args] [flags] | [flags] -- [args]]",
 	Aliases: []string{"cmd"},
 	Short:   "Run app commands",
 	Long: `Run an app specific command.
@@ -92,7 +92,7 @@ does not).`,
 	Run: func(cmd *cobra.Command, args []string) {
 		app := internal.ValidateApp(args)
 
-		if err := app.Recipe.Ensure(internal.Chaos, internal.Offline); err != nil {
+		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
 			log.Fatal(err)
 		}
 
@@ -192,14 +192,14 @@ does not).`,
 }
 
 var AppCmdListCommand = &cobra.Command{
-	Use:     "list <app> [flags]",
+	Use:     "list <domain> [flags]",
 	Aliases: []string{"ls"},
 	Short:   "List all available commands",
 	Args:    cobra.MinimumNArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
 		app := internal.ValidateApp(args)
 
-		if err := app.Recipe.Ensure(internal.Chaos, internal.Offline); err != nil {
+		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
 			log.Fatal(err)
 		}
 
@@ -261,7 +261,7 @@ func init() {
 	AppCmdCommand.Flags().BoolVarP(
 		&requestTTY,
 		"tty",
-		"t",
+		"T",
 		false,
 		"request remote TTY",
 	)

cli/app/cmd_test.go

@@ -13,7 +13,7 @@ func TestParseCmdArgs(t *testing.T) {
 	}{
 		// `--` is not parsed when passed in from the command-line e.g. -- foo bar baz
 		// so we need to eumlate that as missing when testing if bash args are passed in
-		// see https://git.coopcloud.tech/coop-cloud/organising/issues/336 for more
+		// see https://git.coopcloud.tech/toolshed/organising/issues/336 for more
 		{[]string{"foo.com", "app", "test"}, false, ""},
 		{[]string{"foo.com", "app", "test", "foo"}, true, "foo "},
 		{[]string{"foo.com", "app", "test", "foo", "bar", "baz"}, true, "foo bar baz "},

cli/app/config.go

@@ -12,7 +12,7 @@ import (
 )
 
 var AppConfigCommand = &cobra.Command{
-	Use:     "config <app> [flags]",
+	Use:     "config <domain> [flags]",
 	Aliases: []string{"cfg"},
 	Short:   "Edit app config",
 	Example: "  abra config 1312.net",

cli/app/cp.go

@@ -26,7 +26,7 @@ import (
 )
 
 var AppCpCommand = &cobra.Command{
-	Use:     "cp <app> <src> <dst> [flags]",
+	Use:     "cp <domain> <src> <dst> [flags]",
 	Aliases: []string{"c"},
 	Short:   "Copy files to/from a deployed app service",
 	Example: `  # copy myfile.txt to the root of the app service
@@ -49,7 +49,7 @@ var AppCpCommand = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		app := internal.ValidateApp(args)
 
-		if err := app.Recipe.Ensure(internal.Chaos, internal.Offline); err != nil {
+		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
 			log.Fatal(err)
 		}
 

cli/app/deploy.go

@@ -2,10 +2,10 @@ package app
 
 import (
 	"context"
-	"errors"
 	"fmt"
 
 	"coopcloud.tech/abra/cli/internal"
+	"coopcloud.tech/abra/pkg/app"
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/config"
 	"coopcloud.tech/abra/pkg/envfile"
@@ -18,18 +18,19 @@ import (
 	"coopcloud.tech/abra/pkg/lint"
 	"coopcloud.tech/abra/pkg/log"
 	"coopcloud.tech/abra/pkg/upstream/stack"
+	dockerClient "github.com/docker/docker/client"
 	"github.com/spf13/cobra"
 )
 
 var AppDeployCommand = &cobra.Command{
-	Use:     "deploy <app> [version] [flags]",
+	Use:     "deploy <domain> [version] [flags]",
 	Aliases: []string{"d"},
 	Short:   "Deploy an app",
 	Long: `Deploy an app.
 
-This command supports chaos operations. Use "--chaos/-c" to deploy your recipe
-checkout as-is. Recipe commit hashes are also supported values for "[version]".
-Please note, "upgrade"/"rollback" do not support chaos operations.`,
+This command supports chaos operations. Use "--chaos/-C" to deploy your recipe
+checkout as-is. Recipe commit hashes are also supported as values for
+"[version]". Please note, "upgrade"/"rollback" do not support chaos operations.`,
 	Example: `  # standard deployment
   abra app deploy 1312.net
 
@@ -45,7 +46,8 @@ Please note, "upgrade"/"rollback" do not support chaos operations.`,
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
 		args []string,
-		toComplete string) ([]string, cobra.ShellCompDirective) {
+		toComplete string,
+	) ([]string, cobra.ShellCompDirective) {
 		switch l := len(args); l {
 		case 0:
 			return autocomplete.AppNameComplete()
@@ -61,29 +63,20 @@ Please note, "upgrade"/"rollback" do not support chaos operations.`,
 		}
 	},
 	Run: func(cmd *cobra.Command, args []string) {
-		var warnMessages []string
+		var (
+			deployWarnMessages   []string
+			toDeployVersion      string
+			isChaosCommit        bool
+			toDeployChaosVersion = config.CHAOS_DEFAULT
+		)
 
 		app := internal.ValidateApp(args)
-		stackName := app.StackName()
 
-		ok, err := validateChaosXORVersion(args)
-		if !ok {
-			log.Fatalf(err.Error())
+		if err := validateArgsAndFlags(args); err != nil {
+			log.Fatal(err)
 		}
 
-		specificVersion := getSpecifiedVersion(args)
-
-		if specificVersion != "" {
-			log.Debugf("overriding env file version (%s) with %s", app.Recipe.Version, specificVersion)
-			app.Recipe.Version = specificVersion
-		}
-
-		if specificVersion == "" && app.Recipe.Version != "" && !internal.Chaos {
-			log.Debugf("retrieved %s as version from env file", app.Recipe.Version)
-			specificVersion = app.Recipe.Version
-		}
-
-		if err := app.Recipe.Ensure(internal.Chaos, internal.Offline); err != nil {
+		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
 			log.Fatal(err)
 		}
 
@@ -91,96 +84,50 @@ Please note, "upgrade"/"rollback" do not support chaos operations.`,
 			log.Fatal(err)
 		}
 
-		log.Debugf("checking whether %s is already deployed", stackName)
-
 		cl, err := client.New(app.Server)
 		if err != nil {
 			log.Fatal(err)
 		}
 
-		deployMeta, err := stack.IsDeployed(context.Background(), cl, stackName)
+		log.Debugf("checking whether %s is already deployed", app.StackName())
+
+		deployMeta, err := stack.IsDeployed(context.Background(), cl, app.StackName())
 		if err != nil {
 			log.Fatal(err)
 		}
 
-		// NOTE(d1): handles "<version> as git hash" use case
-		var isChaosCommit bool
-
-		// NOTE(d1): check out specific version before dealing with secrets. This
-		// is because we need to deal with GetComposeFiles under the hood and these
-		// files change from version to version which therefore affects which
-		// secrets might be generated
-		toDeployVersion := deployMeta.Version
-		if specificVersion != "" {
-			toDeployVersion = specificVersion
-			log.Debugf("choosing %s as version to deploy", toDeployVersion)
-
-			var err error
-			isChaosCommit, err = app.Recipe.EnsureVersion(toDeployVersion)
-			if err != nil {
-				log.Fatal(err)
-			}
-
-			if isChaosCommit {
-				log.Debugf("assuming '%s' is a chaos commit", toDeployVersion)
-				internal.Chaos = true
-			}
-		}
-
-		secStats, err := secret.PollSecretsStatus(cl, app)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		for _, secStat := range secStats {
-			if !secStat.CreatedOnRemote {
-				log.Fatalf("unable to deploy, secrets not generated (%s)?", secStat.LocalName)
-			}
-		}
-
 		if deployMeta.IsDeployed && !(internal.Force || internal.Chaos) {
 			log.Fatalf("%s is already deployed", app.Name)
 		}
 
-		if !internal.Chaos && specificVersion == "" {
-			versions, err := app.Recipe.Tags()
+		toDeployVersion, toDeployChaosVersion, err = getDeployVersion(args, deployMeta, app)
 		if err != nil {
 			log.Fatal(err)
 		}
 
-			if len(versions) > 0 && !internal.Chaos {
-				toDeployVersion = versions[len(versions)-1]
-				log.Debugf("choosing %s as version to deploy", toDeployVersion)
-				if _, err := app.Recipe.EnsureVersion(toDeployVersion); err != nil {
-					log.Fatal(err)
-				}
-			} else {
-				head, err := app.Recipe.Head()
+		if !internal.Chaos {
+			isChaosCommit, err = app.Recipe.EnsureVersion(toDeployVersion)
 			if err != nil {
 				log.Fatal(err)
 			}
-				toDeployVersion = formatter.SmallSHA(head.String())
-			}
-		}
 
-		toDeployChaosVersion := config.CHAOS_DEFAULT
-		if internal.Chaos {
 			if isChaosCommit {
-				toDeployChaosVersion = specificVersion
-				versionLabelLocal, err := app.Recipe.GetVersionLabelLocal()
-				if err != nil {
-					log.Fatal(err)
-				}
-				toDeployVersion = versionLabelLocal
-			} else {
-				var err error
-				toDeployChaosVersion, err = app.Recipe.ChaosVersion()
+				log.Debugf("assuming chaos commit: %s", toDeployVersion)
+
+				internal.Chaos = true
+				toDeployChaosVersion = toDeployVersion
+
+				toDeployVersion, err = app.Recipe.GetVersionLabelLocal()
 				if err != nil {
 					log.Fatal(err)
 				}
 			}
 		}
 
+		if err := validateSecrets(cl, app); err != nil {
+			log.Fatal(err)
+		}
+
 		abraShEnv, err := envfile.ReadAbraShEnvVars(app.Recipe.AbraShPath)
 		if err != nil {
 			log.Fatal(err)
@@ -194,6 +141,7 @@ Please note, "upgrade"/"rollback" do not support chaos operations.`,
 			log.Fatal(err)
 		}
 
+		stackName := app.StackName()
 		deployOpts := stack.Deploy{
 			Composefiles: composeFiles,
 			Namespace:    stackName,
@@ -206,10 +154,17 @@ Please note, "upgrade"/"rollback" do not support chaos operations.`,
 			log.Fatal(err)
 		}
 
+		toDeployChaosVersionLabel := toDeployChaosVersion
+		if app.Recipe.Dirty {
+			toDeployChaosVersionLabel = formatter.AddDirtyMarker(toDeployChaosVersionLabel)
+		}
+
 		appPkg.ExposeAllEnv(stackName, compose, app.Env)
 		appPkg.SetRecipeLabel(compose, stackName, app.Recipe.Name)
 		appPkg.SetChaosLabel(compose, stackName, internal.Chaos)
-		appPkg.SetChaosVersionLabel(compose, stackName, toDeployChaosVersion)
+		if internal.Chaos {
+			appPkg.SetChaosVersionLabel(compose, stackName, toDeployChaosVersionLabel)
+		}
 		appPkg.SetUpdateLabel(compose, stackName, app.Env)
 
 		envVars, err := appPkg.CheckEnv(app)
@@ -219,23 +174,22 @@ Please note, "upgrade"/"rollback" do not support chaos operations.`,
 
 		for _, envVar := range envVars {
 			if !envVar.Present {
-				warnMessages = append(warnMessages,
-					fmt.Sprintf("env var %s missing from %s.env, present in recipe .env.sample", envVar.Name, app.Domain),
+				deployWarnMessages = append(deployWarnMessages,
+					fmt.Sprintf("%s missing from %s.env", envVar.Name, app.Domain),
 				)
 			}
 		}
 
 		if !internal.NoDomainChecks {
-			domainName, ok := app.Env["DOMAIN"]
-			if ok {
+			if domainName, ok := app.Env["DOMAIN"]; ok {
 				if _, err = dns.EnsureDomainsResolveSameIPv4(domainName, app.Server); err != nil {
 					log.Fatal(err)
 				}
 			} else {
-				log.Debug("skipping domain checks as no DOMAIN=... configured for app")
+				log.Debug("skipping domain checks, no DOMAIN=... configured")
 			}
 		} else {
-			log.Debug("skipping domain checks as requested")
+			log.Debug("skipping domain checks")
 		}
 
 		deployedVersion := config.NO_VERSION_DEFAULT
@@ -243,13 +197,20 @@ Please note, "upgrade"/"rollback" do not support chaos operations.`,
 			deployedVersion = deployMeta.Version
 		}
 
+		toWriteVersion := toDeployVersion
+		if internal.Chaos || isChaosCommit {
+			toWriteVersion = toDeployChaosVersion
+		}
+
 		if err := internal.DeployOverview(
 			app,
-			warnMessages,
+			deployWarnMessages,
 			deployedVersion,
 			deployMeta.ChaosVersion,
 			toDeployVersion,
-			toDeployChaosVersion); err != nil {
+			toDeployChaosVersion,
+			toWriteVersion,
+		); err != nil {
 			log.Fatal(err)
 		}
 
@@ -257,9 +218,17 @@ Please note, "upgrade"/"rollback" do not support chaos operations.`,
 		if err != nil {
 			log.Fatal(err)
 		}
-		log.Debugf("set waiting timeout to %d s", stack.WaitTimeout)
 
-		if err := stack.RunDeploy(cl, deployOpts, compose, app.Name, internal.DontWaitConverge); err != nil {
+		log.Debugf("set waiting timeout to %d second(s)", stack.WaitTimeout)
+
+		if err := stack.RunDeploy(
+			cl,
+			deployOpts,
+			compose,
+			app.Name,
+			app.Server,
+			internal.DontWaitConverge,
+		); err != nil {
 			log.Fatal(err)
 		}
 
@@ -271,31 +240,111 @@ Please note, "upgrade"/"rollback" do not support chaos operations.`,
 			}
 		}
 
-		app.Recipe.Version = toDeployVersion
-		if toDeployChaosVersion != config.CHAOS_DEFAULT {
-			app.Recipe.Version = toDeployChaosVersion
-		}
-		log.Debugf("choosing %s as version to save to env file", app.Recipe.Version)
-		if err := app.WriteRecipeVersion(app.Recipe.Version, false); err != nil {
-			log.Fatalf("writing new recipe version in env file: %s", err)
+		if err := app.WriteRecipeVersion(toWriteVersion, false); err != nil {
+			log.Fatalf("writing recipe version failed: %s", err)
 		}
 	},
 }
 
-// validateChaosXORVersion xor checks version/chaos mode
-func validateChaosXORVersion(args []string) (bool, error) {
-	if getSpecifiedVersion(args) != "" && internal.Chaos {
-		return false, errors.New("cannot use <version> and --chaos together")
+func getChaosVersion(app app.App, toDeployVersion, toDeployChaosVersion *string) error {
+	var err error
+	*toDeployChaosVersion, err = app.Recipe.ChaosVersion()
+	if err != nil {
+		return err
 	}
-	return true, nil
+
+	*toDeployVersion, err = app.Recipe.GetVersionLabelLocal()
+	if err != nil {
+		return err
+	}
+
+	return nil
 }
 
-// getSpecifiedVersion retrieves the specific version if available
-func getSpecifiedVersion(args []string) string {
-	if len(args) >= 2 {
-		return args[1]
+func getLatestVersionOrCommit(app app.App) (string, string, error) {
+	versions, err := app.Recipe.Tags()
+	if err != nil {
+		return "", "", err
 	}
-	return ""
+
+	if len(versions) > 0 && !internal.Chaos {
+		return versions[len(versions)-1], "", nil
+	}
+
+	head, err := app.Recipe.Head()
+	if err != nil {
+		return "", "", err
+	}
+
+	return "", formatter.SmallSHA(head.String()), nil
+}
+
+// validateArgsAndFlags ensures compatible args/flags.
+func validateArgsAndFlags(args []string) error {
+	if len(args) == 2 && args[1] != "" && internal.Chaos {
+		return fmt.Errorf("cannot use [version] and --chaos together")
+	}
+
+	return nil
+}
+
+func validateSecrets(cl *dockerClient.Client, app app.App) error {
+	secStats, err := secret.PollSecretsStatus(cl, app)
+	if err != nil {
+		return err
+	}
+
+	for _, secStat := range secStats {
+		if !secStat.CreatedOnRemote {
+			return fmt.Errorf("secret not generated: %s", secStat.LocalName)
+		}
+	}
+
+	return nil
+}
+
+func getDeployVersion(cliArgs []string, deployMeta stack.DeployMeta, app app.App) (string, string, error) {
+	// Chaos mode overrides everything
+	if internal.Chaos {
+		v, err := app.Recipe.ChaosVersion()
+		if err != nil {
+			return "", "", err
+		}
+		cv, err := app.Recipe.GetVersionLabelLocal()
+		if err != nil {
+			return "", "", err
+		}
+		log.Debugf("version: taking chaos version: %s, %s", v, cv)
+		return v, cv, nil
+	}
+
+	// Check if the deploy version is set with a cli argument
+	if len(cliArgs) == 2 && cliArgs[1] != "" {
+		log.Debugf("version: taking version from cli arg: %s", cliArgs[1])
+		return cliArgs[1], "", nil
+	}
+
+	// Check if the recipe has a version in the .env file
+	if app.Recipe.EnvVersion != "" && !internal.IgnoreEnvVersion {
+		log.Debugf("version: taking version from .env file: %s", app.Recipe.EnvVersion)
+		return app.Recipe.EnvVersion, "", nil
+	}
+
+	// Take deployed version
+	if deployMeta.IsDeployed {
+		log.Debugf("version: taking deployed version: %s", deployMeta.Version)
+		return deployMeta.Version, "", nil
+	}
+
+	v, vc, err := getLatestVersionOrCommit(app)
+	log.Debugf("version: taking new recipe versio: %s, %s", v, vc)
+	if err != nil {
+		log.Fatal(err)
+	}
+	if v == "" {
+		return vc, vc, nil
+	}
+	return v, vc, nil
 }
 
 func init() {
@@ -328,6 +377,6 @@ func init() {
 		"no-converge-checks",
 		"c",
 		false,
-		"do not wait for converge logic checks",
+		"disable converge logic checks",
 	)
 }

cli/app/deploy_test.go

@@ -1,57 +0,0 @@
-package app
-
-import (
-	"testing"
-
-	"coopcloud.tech/abra/cli/internal"
-)
-
-func TestGetSpecificVersion(t *testing.T) {
-	tests := []struct {
-		input          []string
-		expectedOutput string
-	}{
-		// No specified version when command has one or less args
-		{[]string{}, ""},
-		{[]string{"arg0"}, ""},
-		// Second in arg (index-1) is the specified result when command has more than 1 args
-		{[]string{"arg0", "arg1"}, "arg1"},
-		{[]string{"arg0", "arg1", "arg2"}, "arg1"},
-	}
-
-	for _, test := range tests {
-		if test.expectedOutput != getSpecifiedVersion(test.input) {
-			t.Fatalf("result for %s should be %s", test.input, test.expectedOutput)
-		}
-	}
-}
-
-func TestValidateChaosXORVersion(t *testing.T) {
-	tests := []struct {
-		input          []string
-		isChaos        bool
-		expectedResult bool
-	}{
-		// Chaos = true, Specified Version absent
-		{[]string{}, true, true},
-		// Chaos = false, Specified Version absent
-		{[]string{}, false, true},
-		// Chaos = true, Specified Version present
-		{[]string{"arg0", "arg1"}, true, false},
-		// Chaos = false, Specified Version present
-		{[]string{"arg0", "arg1", "arg2"}, false, true},
-	}
-
-	for _, test := range tests {
-		internal.Chaos = test.isChaos
-		res, _ := validateChaosXORVersion(test.input)
-		if res != test.expectedResult {
-			t.Fatalf(
-				"When args are %s and Chaos mode is %t result needs to be %t",
-				test.input,
-				test.isChaos,
-				test.expectedResult,
-			)
-		}
-	}
-}

cli/app/diff.go

@@ -1,51 +0,0 @@
-package app
-
-import (
-	"fmt"
-	"path/filepath"
-
-	"coopcloud.tech/abra/cli/internal"
-	"coopcloud.tech/abra/pkg/autocomplete"
-	gitPkg "coopcloud.tech/abra/pkg/git"
-	"coopcloud.tech/abra/pkg/log"
-	"github.com/spf13/cobra"
-)
-
-var AppDiffCommand = &cobra.Command{
-	Use:     "diff <app> [flags]",
-	Aliases: []string{"df"},
-	Short:   "Show diff of app env changes",
-	Long:    `This command requires /usr/bin/git.`,
-	Example: "  abra app diff 1312.net",
-	Args:    cobra.ExactArgs(1),
-	ValidArgsFunction: func(
-		cmd *cobra.Command,
-		args []string,
-		toComplete string) ([]string, cobra.ShellCompDirective) {
-		return autocomplete.AppNameComplete()
-	},
-	Run: func(cmd *cobra.Command, args []string) {
-		app := internal.ValidateApp(args)
-
-		gitDir := gitPkg.FindDir(app.Path)
-		if gitDir == "" {
-			log.Fatal(fmt.Errorf("no git repo found for %s", app.Name))
-		}
-
-		fpath := app.Path
-		realPath, err := filepath.EvalSymlinks(fpath)
-		if err != nil {
-			log.Fatalf("unable to app env: broken symlink: %s", fpath)
-		}
-		fpath = realPath
-
-		diff, err := gitPkg.DiffUnstaged(gitDir, fpath)
-		if err != nil {
-			log.Fatalf("unable to diff %s: %s", app.Name, err)
-		}
-
-		if diff != "" {
-			fmt.Print(diff)
-		}
-	},
-}

cli/app/env.go

@@ -0,0 +1,43 @@
+package app
+
+import (
+	"fmt"
+	"sort"
+
+	"coopcloud.tech/abra/cli/internal"
+	"coopcloud.tech/abra/pkg/autocomplete"
+	"coopcloud.tech/abra/pkg/formatter"
+	"github.com/spf13/cobra"
+)
+
+var AppEnvCommand = &cobra.Command{
+	Use:     "env <domain> [flags]",
+	Aliases: []string{"e"},
+	Short:   "Show app .env values",
+	Example: "  abra app env 1312.net",
+	Args:    cobra.ExactArgs(1),
+	ValidArgsFunction: func(
+		cmd *cobra.Command,
+		args []string,
+		toComplete string) ([]string, cobra.ShellCompDirective) {
+		return autocomplete.AppNameComplete()
+	},
+	Run: func(cmd *cobra.Command, args []string) {
+		app := internal.ValidateApp(args)
+
+		var envKeys []string
+		for k := range app.Env {
+			envKeys = append(envKeys, k)
+		}
+
+		sort.Strings(envKeys)
+
+		var rows [][]string
+		for _, k := range envKeys {
+			rows = append(rows, []string{k, app.Env[k]})
+		}
+
+		overview := formatter.CreateOverview("ENV OVERVIEW", rows)
+		fmt.Println(overview)
+	},
+}

cli/app/labels.go

@@ -0,0 +1,139 @@
+package app
+
+import (
+	"context"
+	"fmt"
+	"sort"
+
+	"coopcloud.tech/abra/cli/internal"
+	"coopcloud.tech/abra/pkg/autocomplete"
+	"coopcloud.tech/abra/pkg/client"
+	"coopcloud.tech/abra/pkg/formatter"
+	"coopcloud.tech/abra/pkg/log"
+	"coopcloud.tech/abra/pkg/upstream/convert"
+	composetypes "github.com/docker/cli/cli/compose/types"
+	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/api/types/filters"
+	dockerClient "github.com/docker/docker/client"
+	"github.com/spf13/cobra"
+)
+
+var AppLabelsCommand = &cobra.Command{
+	Use:     "labels <domain> [flags]",
+	Aliases: []string{"lb"},
+	Short:   "Show deployment labels",
+	Long:    "Both local recipe and live deployment labels are shown.",
+	Example: "  abra app labels 1312.net",
+	Args:    cobra.ExactArgs(1),
+	ValidArgsFunction: func(
+		cmd *cobra.Command,
+		args []string,
+		toComplete string) ([]string, cobra.ShellCompDirective) {
+		return autocomplete.AppNameComplete()
+	},
+	Run: func(cmd *cobra.Command, args []string) {
+		app := internal.ValidateApp(args)
+
+		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
+			log.Fatal(err)
+		}
+
+		cl, err := client.New(app.Server)
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		remoteLabels, err := getLabels(cl, app.StackName())
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		rows := [][]string{
+			{"DEPLOYED LABELS", "---"},
+		}
+
+		remoteLabelKeys := make([]string, 0, len(remoteLabels))
+		for k := range remoteLabels {
+			remoteLabelKeys = append(remoteLabelKeys, k)
+		}
+
+		sort.Strings(remoteLabelKeys)
+
+		for _, k := range remoteLabelKeys {
+			rows = append(rows, []string{
+				k,
+				remoteLabels[k],
+			})
+		}
+
+		if len(remoteLabelKeys) == 0 {
+			rows = append(rows, []string{"unknown"})
+		}
+
+		rows = append(rows, []string{"RECIPE LABELS", "---"})
+
+		config, err := app.Recipe.GetComposeConfig(app.Env)
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		var localLabelKeys []string
+		var appServiceConfig composetypes.ServiceConfig
+		for _, service := range config.Services {
+			if service.Name == "app" {
+				appServiceConfig = service
+
+				for k := range service.Deploy.Labels {
+					localLabelKeys = append(localLabelKeys, k)
+				}
+			}
+		}
+
+		sort.Strings(localLabelKeys)
+
+		for _, k := range localLabelKeys {
+			rows = append(rows, []string{
+				k,
+				appServiceConfig.Deploy.Labels[k],
+			})
+		}
+
+		overview := formatter.CreateOverview("LABELS OVERVIEW", rows)
+		fmt.Println(overview)
+	},
+}
+
+// getLabels reads docker labels from running services in the format of "coop-cloud.${STACK_NAME}.${LABEL}".
+func getLabels(cl *dockerClient.Client, stackName string) (map[string]string, error) {
+	labels := make(map[string]string)
+
+	filter := filters.NewArgs()
+	filter.Add("label", fmt.Sprintf("%s=%s", convert.LabelNamespace, stackName))
+
+	services, err := cl.ServiceList(context.Background(), types.ServiceListOptions{Filters: filter})
+	if err != nil {
+		return labels, err
+	}
+
+	for _, service := range services {
+		if service.Spec.Name != fmt.Sprintf("%s_app", stackName) {
+			continue
+		}
+
+		for k, v := range service.Spec.Labels {
+			labels[k] = v
+		}
+	}
+
+	return labels, nil
+}
+
+func init() {
+	AppLabelsCommand.Flags().BoolVarP(
+		&internal.Chaos,
+		"chaos",
+		"C",
+		false,
+		"ignore uncommitted recipes changes",
+	)
+}

cli/app/logs.go

@@ -3,11 +3,6 @@ package app
 import (
 	"context"
 	"fmt"
-	"io"
-	"os"
-	"slices"
-	"sync"
-	"time"
 
 	"coopcloud.tech/abra/cli/internal"
 	appPkg "coopcloud.tech/abra/pkg/app"
@@ -15,16 +10,11 @@ import (
 	"coopcloud.tech/abra/pkg/client"
 	"coopcloud.tech/abra/pkg/log"
 	"coopcloud.tech/abra/pkg/upstream/stack"
-	"github.com/docker/docker/api/types"
-	containerTypes "github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/swarm"
-	dockerClient "github.com/docker/docker/client"
 	"github.com/spf13/cobra"
 )
 
 var AppLogsCommand = &cobra.Command{
-	Use:     "logs <app> [service] [flags]",
+	Use:     "logs <domain> [service] [flags]",
 	Aliases: []string{"l"},
 	Short:   "Tail app logs",
 	Args:    cobra.RangeArgs(1, 2),
@@ -68,85 +58,26 @@ var AppLogsCommand = &cobra.Command{
 			log.Fatalf("%s is not deployed?", app.Name)
 		}
 
-		var serviceNames []string
-		if len(args) == 2 {
-			serviceNames = []string{args[1]}
-		}
+		// TODO
+		// var serviceNames []string
+		// if len(args) == 2 {
+		// 	serviceNames = []string{args[1]}
+		// }
 
-		if err = tailLogs(cl, app, serviceNames); err != nil {
-			log.Fatal(err)
-		}
+		// b, err := logs.TailLogs(
+		// 	cl,
+		// 	app,
+		// 	serviceNames,
+		// 	stdErr,
+		// 	sinceLogs,
+		// 	true,
+		// )
+		// if err != nil {
+		// 	log.Fatal(err)
+		// }
 	},
 }
 
-// tailLogs prints logs for the given app with optional service names to be
-// filtered on. It also checks if the latest task is not runnning and then
-// prints the past tasks.
-func tailLogs(cl *dockerClient.Client, app appPkg.App, serviceNames []string) error {
-	f, err := app.Filters(true, false, serviceNames...)
-	if err != nil {
-		return err
-	}
-
-	services, err := cl.ServiceList(context.Background(), types.ServiceListOptions{Filters: f})
-	if err != nil {
-		return err
-	}
-
-	var wg sync.WaitGroup
-	for _, service := range services {
-		filters := filters.NewArgs()
-		filters.Add("name", service.Spec.Name)
-		tasks, err := cl.TaskList(context.Background(), types.TaskListOptions{Filters: f})
-		if err != nil {
-			return err
-		}
-		if len(tasks) > 0 {
-			// Need to sort the tasks by the CreatedAt field in the inverse order.
-			// Otherwise they are in the reversed order and not sorted properly.
-			slices.SortFunc[[]swarm.Task](tasks, func(t1, t2 swarm.Task) int {
-				return int(t2.Meta.CreatedAt.Unix() - t1.Meta.CreatedAt.Unix())
-			})
-			lastTask := tasks[0].Status
-			if lastTask.State != swarm.TaskStateRunning {
-				for _, task := range tasks {
-					log.Errorf("[%s] %s State %s: %s", service.Spec.Name, task.Meta.CreatedAt.Format(time.RFC3339), task.Status.State, task.Status.Err)
-				}
-			}
-		}
-
-		// Collect the logs in a go routine, so the logs from all services are
-		// collected in parallel.
-		wg.Add(1)
-		go func(serviceID string) {
-			logs, err := cl.ServiceLogs(context.Background(), serviceID, containerTypes.LogsOptions{
-				ShowStderr: true,
-				ShowStdout: !stdErr,
-				Since:      sinceLogs,
-				Until:      "",
-				Timestamps: true,
-				Follow:     true,
-				Tail:       "20",
-				Details:    false,
-			})
-			if err != nil {
-				log.Fatal(err)
-			}
-			defer logs.Close()
-
-			_, err = io.Copy(os.Stdout, logs)
-			if err != nil && err != io.EOF {
-				log.Fatal(err)
-			}
-		}(service.ID)
-	}
-
-	// Wait for all log streams to be closed.
-	wg.Wait()
-
-	return nil
-}
-
 var (
 	stdErr    bool
 	sinceLogs string

cli/app/new.go

@@ -25,7 +25,7 @@ This new app configuration is stored in your $ABRA_DIR directory under the
 appropriate server.
 
 This command does not deploy your app for you. You will need to run "abra app
-deploy <app>" to do so.
+deploy <domain>" to do so.
 
 You can see what recipes are available (i.e. values for the [recipe] argument)
 by running "abra recipe ls".
@@ -75,25 +75,22 @@ var AppNewCommand = &cobra.Command{
 
 		chaosVersion := config.CHAOS_DEFAULT
 		if internal.Chaos {
-			recipeVersion = chaosVersion
-
-			if !internal.Offline {
-				if err := recipe.EnsureUpToDate(); err != nil {
+			var err error
+			chaosVersion, err = recipe.ChaosVersion()
+			if err != nil {
 				log.Fatal(err)
 			}
-			}
-		}
 
-		if !internal.Chaos {
+			recipeVersion = chaosVersion
+		} else {
 			if err := recipe.EnsureIsClean(); err != nil {
 				log.Fatal(err)
 			}
-		}
 
 			var recipeVersions recipePkg.RecipeVersions
 			if recipeVersion == "" {
 				var err error
-			recipeVersions, err = recipe.GetRecipeVersions()
+				recipeVersions, _, err = recipe.GetRecipeVersions()
 				if err != nil {
 					log.Fatal(err)
 				}
@@ -113,6 +110,7 @@ var AppNewCommand = &cobra.Command{
 					log.Fatal(err)
 				}
 			}
+		}
 
 		if err := ensureServerFlag(); err != nil {
 			log.Fatal(err)
@@ -201,8 +199,8 @@ var AppNewCommand = &cobra.Command{
 
 			log.Warnf(
 				"secrets are %s shown again, please save them %s",
-				formatter.BoldStyle.Render("NOT"),
-				formatter.BoldStyle.Render("NOW"),
+				formatter.BoldUnderlineStyle.Render("NOT"),
+				formatter.BoldUnderlineStyle.Render("NOW"),
 			)
 		}
 
@@ -211,9 +209,17 @@ var AppNewCommand = &cobra.Command{
 			log.Fatal(err)
 		}
 
-		log.Debugf("choosing %s as version to save to env file", recipeVersion)
-		if err := app.WriteRecipeVersion(recipeVersion, false); err != nil {
-			log.Fatalf("writing new recipe version in env file: %s", err)
+		if err := app.Recipe.IsDirty(); err != nil {
+			log.Fatal(err)
+		}
+
+		toWriteVersion := recipeVersion
+		if internal.Chaos || app.Recipe.Dirty {
+			toWriteVersion = chaosVersion
+		}
+
+		if err := app.WriteRecipeVersion(toWriteVersion, false); err != nil {
+			log.Fatalf("writing recipe version failed: %s", err)
 		}
 	},
 }

cli/app/ps.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"strings"
 
 	"coopcloud.tech/abra/cli/internal"
 	appPkg "coopcloud.tech/abra/pkg/app"
@@ -22,9 +23,9 @@ import (
 )
 
 var AppPsCommand = &cobra.Command{
-	Use:     "ps <app> [flags]",
+	Use:     "ps <domain> [flags]",
 	Aliases: []string{"p"},
-	Short:   "Check app status",
+	Short:   "Check app deployment status",
 	Args:    cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@@ -35,7 +36,7 @@ var AppPsCommand = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		app := internal.ValidateApp(args)
 
-		if err := app.Recipe.Ensure(internal.Chaos, internal.Offline); err != nil {
+		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
 			log.Fatal(err)
 		}
 
@@ -57,9 +58,11 @@ var AppPsCommand = &cobra.Command{
 		statuses, err := appPkg.GetAppStatuses([]appPkg.App{app}, true)
 		if statusMeta, ok := statuses[app.StackName()]; ok {
 			if isChaos, exists := statusMeta["chaos"]; exists && isChaos == "true" {
-				chaosVersion, err = app.Recipe.ChaosVersion()
-				if err != nil {
-					log.Fatal(err)
+				if cVersion, exists := statusMeta["chaosVersion"]; exists {
+					chaosVersion = cVersion
+					if strings.HasSuffix(chaosVersion, config.DIRTY_DEFAULT) {
+						chaosVersion = formatter.BoldDirtyDefault(chaosVersion)
+					}
 				}
 			}
 		}

cli/app/push.go

@@ -1,110 +0,0 @@
-package app
-
-import (
-	"fmt"
-	"path/filepath"
-
-	"coopcloud.tech/abra/cli/internal"
-	"coopcloud.tech/abra/pkg/autocomplete"
-	gitPkg "coopcloud.tech/abra/pkg/git"
-	"coopcloud.tech/abra/pkg/log"
-	"github.com/AlecAivazis/survey/v2"
-	"github.com/spf13/cobra"
-)
-
-var AppPushCommand = &cobra.Command{
-	Use:     "push <app> [flags]",
-	Aliases: []string{"pu"},
-	Short:   "Push app changes to a remote",
-	Long:    `Run "abra app pull <app>" beforehand to reduce conflicts.`,
-	Example: "abra app push 1312.net",
-	Args:    cobra.ExactArgs(1),
-	ValidArgsFunction: func(
-		cmd *cobra.Command,
-		args []string,
-		toComplete string) ([]string, cobra.ShellCompDirective) {
-		return autocomplete.AppNameComplete()
-	},
-	Run: func(cmd *cobra.Command, args []string) {
-		app := internal.ValidateApp(args)
-
-		gitDir := gitPkg.FindDir(app.Path)
-		if gitDir == "" {
-			log.Fatal(fmt.Errorf("no git repo found for %s", app.Name))
-		}
-
-		appDir := filepath.Dir(app.Path)
-		log.Infof("%s currently has these unstaged changes 👇", app.Name)
-		diff, err := gitPkg.DiffUnstaged(appDir, app.Path)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		if diff == "" {
-			log.Infof("no diff for %s, nothing to push", app.Name)
-			return
-		}
-
-		fmt.Print(diff)
-
-		var confirmPush bool
-		if !internal.NoInput {
-			prompt := &survey.Confirm{
-				Message: "push these changes?",
-			}
-
-			if err := survey.AskOne(prompt, &confirmPush); err != nil {
-				log.Fatal(err)
-			}
-		}
-
-		if msg == "" && !internal.NoInput {
-			prompt := &survey.Input{
-				Message: "commit message?",
-			}
-
-			if err := survey.AskOne(prompt, &msg); err != nil {
-				log.Fatal(err)
-			}
-		}
-
-		if msg == "" {
-			log.Fatal("missing --msg/-m")
-		}
-
-		if confirmPush || internal.NoInput {
-			fname := filepath.Base(app.Path)
-			if err := gitPkg.CommitFile(gitDir, fname, msg, internal.Dry); err != nil {
-				log.Fatal(err)
-			}
-
-			if err := gitPkg.Push(gitDir, "origin", false, internal.Dry); err != nil {
-				log.Fatal(err)
-			}
-
-			log.Info("changes pushed successfully 🦋")
-		}
-	},
-}
-
-var (
-	msg string
-)
-
-func init() {
-	AppPushCommand.Flags().StringVarP(
-		&msg,
-		"msg",
-		"m",
-		"",
-		"commit message",
-	)
-
-	AppPushCommand.Flags().BoolVarP(
-		&internal.Dry,
-		"dry-run",
-		"r",
-		false,
-		"report changes that would be made",
-	)
-}

cli/app/remove.go

@@ -16,7 +16,7 @@ import (
 )
 
 var AppRemoveCommand = &cobra.Command{
-	Use:     "remove <app> [flags]",
+	Use:     "remove <domain> [flags]",
 	Aliases: []string{"rm"},
 	Short:   "Remove all app data, locally and remotely",
 	Long: `Remove everything related to an app which is already undeployed.

cli/app/restart.go

@@ -9,18 +9,19 @@ import (
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/client"
 	"coopcloud.tech/abra/pkg/log"
+	"coopcloud.tech/abra/pkg/ui"
 	upstream "coopcloud.tech/abra/pkg/upstream/service"
 	stack "coopcloud.tech/abra/pkg/upstream/stack"
 	"github.com/spf13/cobra"
 )
 
 var AppRestartCommand = &cobra.Command{
-	Use:     "restart <app> [[service] | --all-services] [flags]",
+	Use:     "restart <domain> [[service] | --all-services] [flags]",
 	Aliases: []string{"re"},
 	Short:   "Restart an app",
 	Long: `This command restarts services within a deployed app.
 
-Run "abra app ps <app>" to see a list of service names.
+Run "abra app ps <domain>" to see a list of service names.
 
 Pass "--all-services/-a" to restart all services.`,
 	Example: `  # restart a single app service
@@ -48,7 +49,7 @@ Pass "--all-services/-a" to restart all services.`,
 	Run: func(cmd *cobra.Command, args []string) {
 		app := internal.ValidateApp(args)
 
-		if err := app.Recipe.Ensure(false, false); err != nil {
+		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
 			log.Fatal(err)
 		}
 
@@ -95,11 +96,20 @@ Pass "--all-services/-a" to restart all services.`,
 
 			log.Debugf("attempting to scale %s to 0", stackServiceName)
 
+			// TODO
 			if err := upstream.RunServiceScale(context.Background(), cl, stackServiceName, 0); err != nil {
 				log.Fatal(err)
 			}
 
-			if err := stack.WaitOnService(context.Background(), cl, stackServiceName, app.Name); err != nil {
+			// TODO
+			if err := stack.WaitOnServices(
+				cmd.Context(),
+				cl,
+				// TODO
+				[]ui.ServiceMeta{{Name: stackServiceName, ID: "???"}},
+				app.Name,
+				app.Server,
+			); err != nil {
 				log.Fatal(err)
 			}
 
@@ -110,7 +120,14 @@ Pass "--all-services/-a" to restart all services.`,
 				log.Fatal(err)
 			}
 
-			if err := stack.WaitOnService(context.Background(), cl, stackServiceName, app.Name); err != nil {
+			if err := stack.WaitOnServices(
+				cmd.Context(),
+				cl,
+				// TODO
+				[]ui.ServiceMeta{{Name: stackServiceName, ID: "???"}},
+				app.Name,
+				app.Server,
+			); err != nil {
 				log.Fatal(err)
 			}
 
@@ -123,6 +140,13 @@ Pass "--all-services/-a" to restart all services.`,
 var allServices bool
 
 func init() {
+	AppRestartCommand.Flags().BoolVarP(
+		&internal.Chaos,
+		"chaos",
+		"C",
+		false,
+		"ignore uncommitted recipes changes",
+	)
 	AppRestartCommand.Flags().BoolVarP(
 		&allServices,
 		"all-services",

cli/app/restore.go

@@ -12,7 +12,7 @@ import (
 )
 
 var AppRestoreCommand = &cobra.Command{
-	Use:     "restore <app> [flags]",
+	Use:     "restore <domain> [flags]",
 	Aliases: []string{"rs"},
 	Short:   "Restore a snapshot",
 	Long: `Snapshots are restored while apps are deployed.
@@ -28,7 +28,7 @@ Some restore scenarios may require service / app restarts.`,
 	Run: func(cmd *cobra.Command, args []string) {
 		app := internal.ValidateApp(args)
 
-		if err := app.Recipe.Ensure(internal.Chaos, internal.Offline); err != nil {
+		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
 			log.Fatal(err)
 		}
 

cli/app/rollback.go

@@ -1,13 +1,14 @@
 package app
 
 import (
-	"context"
 	"fmt"
 
+	"coopcloud.tech/abra/pkg/app"
 	appPkg "coopcloud.tech/abra/pkg/app"
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/config"
 	"coopcloud.tech/abra/pkg/envfile"
+	"coopcloud.tech/abra/pkg/formatter"
 	"coopcloud.tech/abra/pkg/lint"
 	stack "coopcloud.tech/abra/pkg/upstream/stack"
 	"coopcloud.tech/tagcmp"
@@ -20,16 +21,23 @@ import (
 )
 
 var AppRollbackCommand = &cobra.Command{
-	Use:     "rollback <app> [version] [flags]",
+	Use:     "rollback <domain> [version] [flags]",
 	Aliases: []string{"rl"},
 	Short:   "Roll an app back to a previous version",
 	Long: `This command rolls an app back to a previous version.
 
-Unlike "deploy", chaos operations are not supported here. Only recipe versions
-are supported values for "[<version>]".
+Unlike "abra app deploy", chaos operations are not supported here. Only recipe
+versions are supported values for "[version]".
 
-A rollback can be destructive, please ensure you have a copy of your app data
-beforehand.`,
+It is possible to "--force/-f" an downgrade if you want to re-deploy a specific
+version.
+
+Only the deployed version is consulted when trying to determine what downgrades
+are available. The live deployment version is the "source of truth" in this
+case. The stored .env version is not consulted.
+
+A downgrade can be destructive, please ensure you have a copy of your app data
+beforehand. See "abra app backup" for more.`,
 	Example: ` # standard rollback
   abra app rollback 1312.net
 
@@ -55,26 +63,15 @@ beforehand.`,
 		}
 	},
 	Run: func(cmd *cobra.Command, args []string) {
-		var warnMessages []string
+		var (
+			downgradeWarnMessages []string
+			chosenDowngrade       string
+			availableDowngrades   []string
+		)
 
 		app := internal.ValidateApp(args)
-		stackName := app.StackName()
 
-		var specificVersion string
-		if len(args) == 2 {
-			specificVersion = args[1]
-		}
-
-		if specificVersion != "" {
-			log.Debugf("overriding env file version (%s) with %s", app.Recipe.Version, specificVersion)
-			app.Recipe.Version = specificVersion
-		}
-
-		if err := app.Recipe.Ensure(internal.Chaos, internal.Offline); err != nil {
-			log.Fatal(err)
-		}
-
-		if err := lint.LintForErrors(app.Recipe); err != nil {
+		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
 			log.Fatal(err)
 		}
 
@@ -83,15 +80,13 @@ beforehand.`,
 			log.Fatal(err)
 		}
 
-		log.Debugf("checking whether %s is already deployed", stackName)
-
-		deployMeta, err := stack.IsDeployed(context.Background(), cl, stackName)
+		deployMeta, err := ensureDeployed(cl, app)
 		if err != nil {
 			log.Fatal(err)
 		}
 
-		if !deployMeta.IsDeployed {
-			log.Fatalf("%s is not deployed?", app.Name)
+		if err := lint.LintForErrors(app.Recipe); err != nil {
+			log.Fatal(err)
 		}
 
 		versions, err := app.Recipe.Tags()
@@ -99,84 +94,56 @@ beforehand.`,
 			log.Fatal(err)
 		}
 
-		var availableDowngrades []string
-		if deployMeta.Version == "unknown" {
+		// NOTE(d1): we've no idea what the live deployment version is, so every
+		// possible downgrade can be shown. it's up to the user to make the choice
+		if deployMeta.Version == config.UNKNOWN_DEFAULT {
 			availableDowngrades = versions
-			warnMessages = append(warnMessages, fmt.Sprintf("failed to determine deployed version of %s", app.Name))
 		}
 
-		if specificVersion != "" {
-			parsedDeployedVersion, err := tagcmp.Parse(deployMeta.Version)
-			if err != nil {
-				log.Fatalf("'%s' is not a known version for %s", deployMeta.Version, app.Recipe.Name)
+		if len(args) == 2 && args[1] != "" {
+			chosenDowngrade = args[1]
+
+			if err := validateDowngradeVersionArg(chosenDowngrade, app, deployMeta); err != nil {
+				log.Fatal(err)
 			}
 
-			parsedSpecificVersion, err := tagcmp.Parse(specificVersion)
-			if err != nil {
-				log.Fatalf("'%s' is not a known version for %s", specificVersion, app.Recipe.Name)
+			availableDowngrades = append(availableDowngrades, chosenDowngrade)
 		}
 
-			if parsedSpecificVersion.IsGreaterThan(parsedDeployedVersion) && !parsedSpecificVersion.Equals(parsedDeployedVersion) {
-				log.Fatalf("%s is not a downgrade for %s?", deployMeta.Version, specificVersion)
-			}
-
-			if parsedSpecificVersion.Equals(parsedDeployedVersion) && !internal.Force {
-				log.Fatalf("%s is not a downgrade for %s?", deployMeta.Version, specificVersion)
-			}
-
-			availableDowngrades = append(availableDowngrades, specificVersion)
-		}
-
-		if deployMeta.Version != "unknown" && specificVersion == "" {
-			if deployMeta.IsChaos {
-				warnMessages = append(warnMessages, fmt.Sprintf("attempting to rollback a chaos deployment"))
-			}
-
-			for _, version := range versions {
-				parsedDeployedVersion, err := tagcmp.Parse(deployMeta.Version)
+		if deployMeta.Version != config.UNKNOWN_DEFAULT && chosenDowngrade == "" {
+			downgradeAvailable, err := ensureDowngradesAvailable(versions, &availableDowngrades, deployMeta)
 			if err != nil {
 				log.Fatal(err)
 			}
 
-				parsedVersion, err := tagcmp.Parse(version)
-				if err != nil {
-					log.Fatal(err)
-				}
-
-				if parsedVersion.IsLessThan(parsedDeployedVersion) && !(parsedVersion.Equals(parsedDeployedVersion)) {
-					availableDowngrades = append(availableDowngrades, version)
-				}
-			}
-
-			if len(availableDowngrades) == 0 && !internal.Force {
+			if !downgradeAvailable {
 				log.Info("no available downgrades")
 				return
 			}
 		}
 
-		var chosenDowngrade string
+		if internal.Force || internal.NoInput || chosenDowngrade != "" {
 			if len(availableDowngrades) > 0 {
-			if internal.Force || internal.NoInput || specificVersion != "" {
 				chosenDowngrade = availableDowngrades[len(availableDowngrades)-1]
-				log.Debugf("choosing %s as version to downgrade to (--force/--no-input)", chosenDowngrade)
+			}
 		} else {
-				msg := fmt.Sprintf("please select a downgrade (version: %s):", deployMeta.Version)
-				if deployMeta.IsChaos {
-					msg = fmt.Sprintf("please select a downgrade (version: %s, chaosVersion: %s):", deployMeta.Version, deployMeta.ChaosVersion)
+			if err := chooseDowngrade(availableDowngrades, deployMeta, &chosenDowngrade); err != nil {
+				log.Fatal(err)
+			}
 		}
 
-				prompt := &survey.Select{
-					Message: msg,
-					Options: internal.SortVersionsDesc(availableDowngrades),
+		if internal.Force &&
+			chosenDowngrade == "" &&
+			deployMeta.Version != config.UNKNOWN_DEFAULT {
+			chosenDowngrade = deployMeta.Version
 		}
 
-				if err := survey.AskOne(prompt, &chosenDowngrade); err != nil {
-					return
-				}
-			}
+		if chosenDowngrade == "" {
+			log.Fatal("unknown deployed version, unable to downgrade")
 		}
 
 		log.Debugf("choosing %s as version to rollback", chosenDowngrade)
+
 		if _, err := app.Recipe.EnsureVersion(chosenDowngrade); err != nil {
 			log.Fatal(err)
 		}
@@ -194,6 +161,7 @@ beforehand.`,
 			log.Fatal(err)
 		}
 
+		stackName := app.StackName()
 		deployOpts := stack.Deploy{
 			Composefiles: composeFiles,
 			Namespace:    stackName,
@@ -210,7 +178,9 @@ beforehand.`,
 		appPkg.ExposeAllEnv(stackName, compose, app.Env)
 		appPkg.SetRecipeLabel(compose, stackName, app.Recipe.Name)
 		appPkg.SetChaosLabel(compose, stackName, internal.Chaos)
+		if internal.Chaos {
 			appPkg.SetChaosVersionLabel(compose, stackName, chosenDowngrade)
+		}
 		appPkg.SetUpdateLabel(compose, stackName, app.Env)
 
 		chaosVersion := config.CHAOS_DEFAULT
@@ -221,27 +191,121 @@ beforehand.`,
 		// NOTE(d1): no release notes implemeneted for rolling back
 		if err := internal.NewVersionOverview(
 			app,
-			warnMessages,
+			downgradeWarnMessages,
 			"rollback",
 			deployMeta.Version,
 			chaosVersion,
 			chosenDowngrade,
-			""); err != nil {
+			"",
+		); err != nil {
 			log.Fatal(err)
 		}
 
-		if err := stack.RunDeploy(cl, deployOpts, compose, stackName, internal.DontWaitConverge); err != nil {
+		if err := stack.RunDeploy(
+			cl,
+			deployOpts,
+			compose,
+			stackName,
+			app.Server,
+			internal.DontWaitConverge,
+		); err != nil {
 			log.Fatal(err)
 		}
 
-		app.Recipe.Version = chosenDowngrade
-		log.Debugf("choosing %s as version to save to env file", app.Recipe.Version)
-		if err := app.WriteRecipeVersion(app.Recipe.Version, false); err != nil {
-			log.Fatalf("writing new recipe version in env file: %s", err)
+		if err := app.WriteRecipeVersion(chosenDowngrade, false); err != nil {
+			log.Fatalf("writing recipe version failed: %s", err)
 		}
 	},
 }
 
+// chooseDowngrade prompts the user to choose an downgrade interactively.
+func chooseDowngrade(
+	availableDowngrades []string,
+	deployMeta stack.DeployMeta,
+	chosenDowngrade *string,
+) error {
+	msg := fmt.Sprintf("please select a downgrade (version: %s):", deployMeta.Version)
+
+	if deployMeta.IsChaos {
+		chaosVersion := formatter.BoldDirtyDefault(deployMeta.ChaosVersion)
+
+		msg = fmt.Sprintf(
+			"please select a downgrade (version: %s, chaos: %s):",
+			deployMeta.Version,
+			chaosVersion,
+		)
+	}
+
+	prompt := &survey.Select{
+		Message: msg,
+		Options: internal.SortVersionsDesc(availableDowngrades),
+	}
+
+	if err := survey.AskOne(prompt, chosenDowngrade); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// validateDownpgradeVersionArg validates the specific version.
+func validateDowngradeVersionArg(
+	specificVersion string,
+	app app.App,
+	deployMeta stack.DeployMeta,
+) error {
+	parsedDeployedVersion, err := tagcmp.Parse(deployMeta.Version)
+	if err != nil {
+		return fmt.Errorf("'%s' is not a known version for %s", deployMeta.Version, app.Recipe.Name)
+	}
+
+	parsedSpecificVersion, err := tagcmp.Parse(specificVersion)
+	if err != nil {
+		return fmt.Errorf("'%s' is not a known version for %s", specificVersion, app.Recipe.Name)
+	}
+
+	if parsedSpecificVersion.IsGreaterThan(parsedDeployedVersion) &&
+		!parsedSpecificVersion.Equals(parsedDeployedVersion) {
+		return fmt.Errorf("%s is not a downgrade for %s?", deployMeta.Version, specificVersion)
+	}
+
+	if parsedSpecificVersion.Equals(parsedDeployedVersion) && !internal.Force {
+		return fmt.Errorf("%s is not a downgrade for %s?", deployMeta.Version, specificVersion)
+	}
+
+	return nil
+}
+
+// ensureDowngradesAvailable ensures that there are available downgrades.
+func ensureDowngradesAvailable(
+	versions []string,
+	availableDowngrades *[]string,
+	deployMeta stack.DeployMeta,
+) (bool, error) {
+	parsedDeployedVersion, err := tagcmp.Parse(deployMeta.Version)
+	if err != nil {
+		return false, err
+	}
+
+	for _, version := range versions {
+		parsedVersion, err := tagcmp.Parse(version)
+		if err != nil {
+			return false, err
+		}
+
+		if parsedVersion.IsLessThan(parsedDeployedVersion) &&
+			!(parsedVersion.Equals(parsedDeployedVersion)) {
+			*availableDowngrades = append(*availableDowngrades, version)
+		}
+	}
+
+	if len(*availableDowngrades) == 0 && !internal.Force {
+		return false, nil
+	}
+
+	return true, nil
+}
+
 func init() {
 	AppRollbackCommand.Flags().BoolVarP(
 		&internal.Force,
@@ -263,6 +327,6 @@ func init() {
 		&internal.DontWaitConverge, "no-converge-checks",
 		"c",
 		false,
-		"do not wait for converge logic checks",
+		"disable converge logic checks",
 	)
 }

cli/app/run.go

@@ -17,7 +17,7 @@ import (
 )
 
 var AppRunCommand = &cobra.Command{
-	Use:     "run <app> <service> <cmd> [[args] [flags] | [flags] -- [args]]",
+	Use:     "run <domain> <service> <cmd> [[args] [flags] | [flags] -- [args]]",
 	Aliases: []string{"r"},
 	Short:   "Run a command inside a service container",
 	Example: `  # run <cmd> with args/flags

cli/app/secret.go

@@ -20,7 +20,7 @@ import (
 )
 
 var AppSecretGenerateCommand = &cobra.Command{
-	Use:     "generate <app> [[secret] [version] | --all] [flags]",
+	Use:     "generate <domain> [[secret] [version] | --all] [flags]",
 	Aliases: []string{"g"},
 	Short:   "Generate secrets",
 	Args:    cobra.RangeArgs(1, 3),
@@ -45,15 +45,15 @@ var AppSecretGenerateCommand = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		app := internal.ValidateApp(args)
 
-		if err := app.Recipe.Ensure(internal.Chaos, internal.Offline); err != nil {
+		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
 			log.Fatal(err)
 		}
 
-		if len(args) == 1 && !generateAllSecrets {
+		if len(args) <= 2 && !generateAllSecrets {
 			log.Fatal("missing arguments [secret]/[version] or '--all'")
 		}
 
-		if len(args) > 1 && generateAllSecrets {
+		if len(args) > 2 && generateAllSecrets {
 			log.Fatal("cannot use '[secret] [version]' and '--all' together")
 		}
 
@@ -140,7 +140,7 @@ var AppSecretGenerateCommand = &cobra.Command{
 }
 
 var AppSecretInsertCommand = &cobra.Command{
-	Use:     "insert <app> <secret> <version> <data> [flags]",
+	Use:     "insert <domain> <secret> <version> <data> [flags]",
 	Aliases: []string{"i"},
 	Short:   "Insert secret",
 	Long: `This command inserts a secret into an app environment.
@@ -170,7 +170,7 @@ environment. Typically, you can let Abra generate them for you on app creation
 	Run: func(cmd *cobra.Command, args []string) {
 		app := internal.ValidateApp(args)
 
-		if err := app.Recipe.Ensure(internal.Chaos, internal.Offline); err != nil {
+		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
 			log.Fatal(err)
 		}
 
@@ -230,7 +230,7 @@ func secretRm(cl *dockerClient.Client, app appPkg.App, secretName, parsed string
 }
 
 var AppSecretRmCommand = &cobra.Command{
-	Use:     "remove <app> [[secret] | --all] [flags]",
+	Use:     "remove <domain> [[secret] | --all] [flags]",
 	Aliases: []string{"rm"},
 	Short:   "Remove a secret",
 	Args:    cobra.RangeArgs(1, 2),
@@ -258,7 +258,7 @@ var AppSecretRmCommand = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		app := internal.ValidateApp(args)
 
-		if err := app.Recipe.Ensure(internal.Chaos, internal.Offline); err != nil {
+		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
 			log.Fatal(err)
 		}
 
@@ -338,7 +338,7 @@ var AppSecretRmCommand = &cobra.Command{
 }
 
 var AppSecretLsCommand = &cobra.Command{
-	Use:     "list <app>",
+	Use:     "list <domain>",
 	Aliases: []string{"ls"},
 	Short:   "List all secrets",
 	Args:    cobra.MinimumNArgs(1),
@@ -351,7 +351,7 @@ var AppSecretLsCommand = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		app := internal.ValidateApp(args)
 
-		if err := app.Recipe.Ensure(internal.Chaos, internal.Offline); err != nil {
+		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
 			log.Fatal(err)
 		}
 

cli/app/services.go

@@ -17,7 +17,7 @@ import (
 )
 
 var AppServicesCommand = &cobra.Command{
-	Use:     "services <app> [flags]",
+	Use:     "services <domain> [flags]",
 	Aliases: []string{"sr"},
 	Short:   "Display all services of an app",
 	Args:    cobra.ExactArgs(1),
@@ -30,7 +30,7 @@ var AppServicesCommand = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		app := internal.ValidateApp(args)
 
-		if err := app.Recipe.Ensure(internal.Chaos, internal.Offline); err != nil {
+		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
 			log.Fatal(err)
 		}
 

cli/app/undeploy.go

@@ -18,7 +18,7 @@ import (
 )
 
 var AppUndeployCommand = &cobra.Command{
-	Use:     "undeploy <app> [flags]",
+	Use:     "undeploy <domain> [flags]",
 	Aliases: []string{"un"},
 	Short:   "Undeploy an app",
 	Long: `This does not destroy any application data.
@@ -59,15 +59,22 @@ Passing "--prune/-p" does not remove those volumes.`,
 			chaosVersion = deployMeta.ChaosVersion
 		}
 
+		toWriteVersion := deployMeta.Version
+		if deployMeta.IsChaos {
+			toWriteVersion = chaosVersion
+		}
+
 		if err := internal.UndeployOverview(
 			app,
 			deployMeta.Version,
-			chaosVersion); err != nil {
+			chaosVersion,
+			toWriteVersion,
+		); err != nil {
 			log.Fatal(err)
 		}
 
 		rmOpts := stack.Remove{
-			Namespaces: []string{app.StackName()},
+			Namespaces: []string{stackName},
 			Detach:     false,
 		}
 		if err := stack.RunRemove(context.Background(), cl, rmOpts); err != nil {
@@ -80,9 +87,8 @@ Passing "--prune/-p" does not remove those volumes.`,
 			}
 		}
 
-		log.Debugf("choosing %s as version to save to env file", deployMeta.Version)
-		if err := app.WriteRecipeVersion(deployMeta.Version, false); err != nil {
-			log.Fatalf("writing undeployed recipe version in env file: %s", err)
+		if err := app.WriteRecipeVersion(toWriteVersion, false); err != nil {
+			log.Fatalf("writing recipe version failed: %s", err)
 		}
 	},
 }

cli/app/upgrade.go

@@ -5,30 +5,40 @@ import (
 	"fmt"
 
 	"coopcloud.tech/abra/cli/internal"
+	"coopcloud.tech/abra/pkg/app"
 	appPkg "coopcloud.tech/abra/pkg/app"
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/client"
 	"coopcloud.tech/abra/pkg/config"
 	"coopcloud.tech/abra/pkg/envfile"
+	"coopcloud.tech/abra/pkg/formatter"
 	"coopcloud.tech/abra/pkg/lint"
 	"coopcloud.tech/abra/pkg/log"
 	stack "coopcloud.tech/abra/pkg/upstream/stack"
 	"coopcloud.tech/tagcmp"
 	"github.com/AlecAivazis/survey/v2"
+	dockerClient "github.com/docker/docker/client"
 	"github.com/spf13/cobra"
 )
 
 var AppUpgradeCommand = &cobra.Command{
-	Use:     "upgrade <app> [version] [flags]",
+	Use:     "upgrade <domain> [version] [flags]",
 	Aliases: []string{"up"},
 	Short:   "Upgrade an app",
 	Long: `Upgrade an app.
 
-Unlike "deploy", chaos operations are not supported here. Only recipe versions
-are supported values for "[version]".
+Unlike "abra app deploy", chaos operations are not supported here. Only recipe
+versions are supported values for "[version]".
+
+It is possible to "--force/-f" an upgrade if you want to re-deploy a specific
+version.
+
+Only the deployed version is consulted when trying to determine what upgrades
+are available. The live deployment version is the "source of truth" in this
+case. The stored .env version is not consulted.
 
 An upgrade can be destructive, please ensure you have a copy of your app data
-beforehand.`,
+beforehand. See "abra app backup" for more.`,
 	Args: cobra.RangeArgs(1, 2),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@@ -49,22 +59,26 @@ beforehand.`,
 		}
 	},
 	Run: func(cmd *cobra.Command, args []string) {
-		var warnMessages []string
+		var (
+			upgradeWarnMessages []string
+			chosenUpgrade       string
+			availableUpgrades   []string
+			upgradeReleaseNotes string
+		)
 
 		app := internal.ValidateApp(args)
-		stackName := app.StackName()
 
-		var specificVersion string
-		if len(args) == 2 {
-			specificVersion = args[1]
+		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
+			log.Fatal(err)
 		}
 
-		if specificVersion != "" {
-			log.Debugf("overriding env file version (%s) with %s", app.Recipe.Version, specificVersion)
-			app.Recipe.Version = specificVersion
+		cl, err := client.New(app.Server)
+		if err != nil {
+			log.Fatal(err)
 		}
 
-		if err := app.Recipe.Ensure(internal.Chaos, internal.Offline); err != nil {
+		deployMeta, err := ensureDeployed(cl, app)
+		if err != nil {
 			log.Fatal(err)
 		}
 
@@ -72,134 +86,69 @@ beforehand.`,
 			log.Fatal(err)
 		}
 
-		log.Debugf("checking whether %s is already deployed", stackName)
-
-		cl, err := client.New(app.Server)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		deployMeta, err := stack.IsDeployed(context.Background(), cl, stackName)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		if !deployMeta.IsDeployed {
-			log.Fatalf("%s is not deployed?", app.Name)
-		}
-
 		versions, err := app.Recipe.Tags()
 		if err != nil {
 			log.Fatal(err)
 		}
 
-		var availableUpgrades []string
-		if deployMeta.Version == "unknown" {
+		// NOTE(d1): we've no idea what the live deployment version is, so every
+		// possible upgrade can be shown. it's up to the user to make the choice
+		if deployMeta.Version == config.UNKNOWN_DEFAULT {
 			availableUpgrades = versions
-			warnMessages = append(warnMessages, fmt.Sprintf("failed to determine deployed version of %s", app.Name))
 		}
 
-		if specificVersion != "" {
-			parsedDeployedVersion, err := tagcmp.Parse(deployMeta.Version)
-			if err != nil {
-				log.Fatalf("'%s' is not a known version for %s", deployMeta.Version, app.Recipe.Name)
-			}
-			parsedSpecificVersion, err := tagcmp.Parse(specificVersion)
-			if err != nil {
-				log.Fatalf("'%s' is not a known version for %s", specificVersion, app.Recipe.Name)
+		if len(args) == 2 && args[1] != "" {
+			chosenUpgrade = args[1]
+
+			if err := validateUpgradeVersionArg(chosenUpgrade, app, deployMeta); err != nil {
+				log.Fatal(err)
 			}
 
-			if parsedSpecificVersion.IsLessThan(parsedDeployedVersion) && !parsedSpecificVersion.Equals(parsedDeployedVersion) {
-				log.Fatalf("%s is not an upgrade for %s?", deployMeta.Version, specificVersion)
+			availableUpgrades = append(availableUpgrades, chosenUpgrade)
 		}
 
-			if parsedSpecificVersion.Equals(parsedDeployedVersion) && !internal.Force {
-				log.Fatalf("%s is not an upgrade for %s?", deployMeta.Version, specificVersion)
-			}
-
-			availableUpgrades = append(availableUpgrades, specificVersion)
-		}
-
-		parsedDeployedVersion, err := tagcmp.Parse(deployMeta.Version)
+		if deployMeta.Version != config.UNKNOWN_DEFAULT && chosenUpgrade == "" {
+			upgradeAvailable, err := ensureUpgradesAvailable(versions, &availableUpgrades, deployMeta)
 			if err != nil {
 				log.Fatal(err)
 			}
 
-		if deployMeta.Version != "unknown" && specificVersion == "" {
-			if deployMeta.IsChaos {
-				warnMessages = append(warnMessages, fmt.Sprintf("attempting to upgrade a chaos deployment"))
-			}
-
-			for _, version := range versions {
-				parsedVersion, err := tagcmp.Parse(version)
-				if err != nil {
-					log.Fatal(err)
-				}
-				if parsedVersion.IsGreaterThan(parsedDeployedVersion) && !(parsedVersion.Equals(parsedDeployedVersion)) {
-					availableUpgrades = append(availableUpgrades, version)
-				}
-			}
-
-			if len(availableUpgrades) == 0 && !internal.Force {
+			if !upgradeAvailable {
 				log.Info("no available upgrades")
 				return
 			}
 		}
 
-		var chosenUpgrade string
+		if internal.Force || internal.NoInput || chosenUpgrade != "" {
 			if len(availableUpgrades) > 0 {
-			if internal.Force || internal.NoInput || specificVersion != "" {
 				chosenUpgrade = availableUpgrades[len(availableUpgrades)-1]
-				log.Debugf("choosing %s as version to upgrade to", chosenUpgrade)
+			}
 		} else {
-				msg := fmt.Sprintf("please select an upgrade (version: %s):", deployMeta.Version)
-				if deployMeta.IsChaos {
-					msg = fmt.Sprintf("please select an upgrade (version: %s, chaosVersion: %s):", deployMeta.Version, deployMeta.ChaosVersion)
-				}
-
-				prompt := &survey.Select{
-					Message: msg,
-					Options: internal.SortVersionsDesc(availableUpgrades),
-				}
-
-				if err := survey.AskOne(prompt, &chosenUpgrade); err != nil {
-					return
-				}
+			if err := chooseUpgrade(availableUpgrades, deployMeta, &chosenUpgrade); err != nil {
+				log.Fatal(err)
 			}
 		}
 
-		if internal.Force && chosenUpgrade == "" {
-			warnMessages = append(warnMessages, fmt.Sprintf("%s is already upgraded to latest", app.Name))
+		if internal.Force &&
+			chosenUpgrade == "" &&
+			deployMeta.Version != config.UNKNOWN_DEFAULT {
 			chosenUpgrade = deployMeta.Version
 		}
 
-		// if release notes written after git tag published, read them before we
-		// check out the tag and then they'll appear to be missing. this covers
-		// when we obviously will forget to write release notes before publishing
-		var releaseNotes string
-		if chosenUpgrade != "" {
-			parsedChosenUpgrade, err := tagcmp.Parse(chosenUpgrade)
-			if err != nil {
-				log.Fatal(err)
-			}
-			for _, version := range versions {
-				parsedVersion, err := tagcmp.Parse(version)
-				if err != nil {
-					log.Fatal(err)
-				}
-				if parsedVersion.IsGreaterThan(parsedDeployedVersion) && parsedVersion.IsLessThan(parsedChosenUpgrade) {
-					note, err := app.Recipe.GetReleaseNotes(version)
-					if err != nil {
-						log.Fatal(err)
-					}
-					if note != "" {
-						releaseNotes += fmt.Sprintf("%s\n", note)
-					}
-				}
-			}
+		if chosenUpgrade == "" {
+			log.Fatal("unknown deployed version, unable to upgrade")
 		}
 
 		log.Debugf("choosing %s as version to upgrade", chosenUpgrade)
+
+		// NOTE(d1): if release notes written after git tag published, read them
+		// before we check out the tag and then they'll appear to be missing. this
+		// covers when we obviously will forget to write release notes before
+		// publishing
+		if err := getReleaseNotes(app, versions, chosenUpgrade, deployMeta, &upgradeReleaseNotes); err != nil {
+			log.Fatal(err)
+		}
+
 		if _, err := app.Recipe.EnsureVersion(chosenUpgrade); err != nil {
 			log.Fatal(err)
 		}
@@ -217,6 +166,7 @@ beforehand.`,
 			log.Fatal(err)
 		}
 
+		stackName := app.StackName()
 		deployOpts := stack.Deploy{
 			Composefiles: composeFiles,
 			Namespace:    stackName,
@@ -233,7 +183,9 @@ beforehand.`,
 		appPkg.ExposeAllEnv(stackName, compose, app.Env)
 		appPkg.SetRecipeLabel(compose, stackName, app.Recipe.Name)
 		appPkg.SetChaosLabel(compose, stackName, internal.Chaos)
+		if internal.Chaos {
 			appPkg.SetChaosVersionLabel(compose, stackName, chosenUpgrade)
+		}
 		appPkg.SetUpdateLabel(compose, stackName, app.Env)
 
 		envVars, err := appPkg.CheckEnv(app)
@@ -243,30 +195,35 @@ beforehand.`,
 
 		for _, envVar := range envVars {
 			if !envVar.Present {
-				warnMessages = append(warnMessages,
-					fmt.Sprintf("env var %s missing from %s.env, present in recipe .env.sample", envVar.Name, app.Domain),
+				upgradeWarnMessages = append(upgradeWarnMessages,
+					fmt.Sprintf("%s missing from %s.env", envVar.Name, app.Domain),
 				)
 			}
 		}
 
 		if showReleaseNotes {
-			fmt.Print(releaseNotes)
+			fmt.Print(upgradeReleaseNotes)
 			return
 		}
 
 		chaosVersion := config.CHAOS_DEFAULT
 		if deployMeta.IsChaos {
 			chaosVersion = deployMeta.ChaosVersion
+
+			if deployMeta.ChaosVersion == "" {
+				chaosVersion = config.UNKNOWN_DEFAULT
+			}
 		}
 
 		if err := internal.NewVersionOverview(
 			app,
-			warnMessages,
+			upgradeWarnMessages,
 			"upgrade",
 			deployMeta.Version,
 			chaosVersion,
 			chosenUpgrade,
-			releaseNotes); err != nil {
+			upgradeReleaseNotes,
+		); err != nil {
 			log.Fatal(err)
 		}
 
@@ -274,28 +231,179 @@ beforehand.`,
 		if err != nil {
 			log.Fatal(err)
 		}
-		log.Debugf("set waiting timeout to %d s", stack.WaitTimeout)
 
-		if err := stack.RunDeploy(cl, deployOpts, compose, stackName, internal.DontWaitConverge); err != nil {
+		log.Debugf("set waiting timeout to %d second(s)", stack.WaitTimeout)
+
+		if err := stack.RunDeploy(
+			cl,
+			deployOpts,
+			compose,
+			stackName,
+			app.Server,
+			internal.DontWaitConverge,
+		); err != nil {
 			log.Fatal(err)
 		}
 
 		postDeployCmds, ok := app.Env["POST_UPGRADE_CMDS"]
 		if ok && !internal.DontWaitConverge {
 			log.Debugf("run the following post-deploy commands: %s", postDeployCmds)
+
 			if err := internal.PostCmds(cl, app, postDeployCmds); err != nil {
 				log.Fatalf("attempting to run post deploy commands, saw: %s", err)
 			}
 		}
 
-		app.Recipe.Version = chosenUpgrade
-		log.Debugf("choosing %s as version to save to env file", app.Recipe.Version)
-		if err := app.WriteRecipeVersion(app.Recipe.Version, false); err != nil {
-			log.Fatalf("writing new recipe version in env file: %s", err)
+		if err := app.WriteRecipeVersion(chosenUpgrade, false); err != nil {
+			log.Fatalf("writing recipe version failed: %s", err)
 		}
 	},
 }
 
+// chooseUpgrade prompts the user to choose an upgrade interactively.
+func chooseUpgrade(
+	availableUpgrades []string,
+	deployMeta stack.DeployMeta,
+	chosenUpgrade *string,
+) error {
+	msg := fmt.Sprintf("please select an upgrade (version: %s):", deployMeta.Version)
+
+	if deployMeta.IsChaos {
+		chaosVersion := formatter.BoldDirtyDefault(deployMeta.ChaosVersion)
+
+		msg = fmt.Sprintf(
+			"please select an upgrade (version: %s, chaos: %s):",
+			deployMeta.Version,
+			chaosVersion,
+		)
+	}
+
+	prompt := &survey.Select{
+		Message: msg,
+		Options: internal.SortVersionsDesc(availableUpgrades),
+	}
+
+	if err := survey.AskOne(prompt, chosenUpgrade); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func getReleaseNotes(
+	app app.App,
+	versions []string,
+	chosenUpgrade string,
+	deployMeta stack.DeployMeta,
+	upgradeReleaseNotes *string,
+) error {
+	parsedChosenUpgrade, err := tagcmp.Parse(chosenUpgrade)
+	if err != nil {
+		return err
+	}
+
+	parsedDeployedVersion, err := tagcmp.Parse(deployMeta.Version)
+	if err != nil {
+		return err
+	}
+
+	for _, version := range internal.SortVersionsDesc(versions) {
+		parsedVersion, err := tagcmp.Parse(version)
+		if err != nil {
+			return err
+		}
+
+		if parsedVersion.IsGreaterThan(parsedDeployedVersion) &&
+			parsedVersion.IsLessThan(parsedChosenUpgrade) {
+			note, err := app.Recipe.GetReleaseNotes(version)
+			if err != nil {
+				return err
+			}
+
+			if note != "" {
+				*upgradeReleaseNotes += fmt.Sprintf("%s\n", note)
+			}
+		}
+	}
+
+	return nil
+}
+
+// ensureUpgradesAvailable ensures that there are available upgrades.
+func ensureUpgradesAvailable(
+	versions []string,
+	availableUpgrades *[]string,
+	deployMeta stack.DeployMeta,
+) (bool, error) {
+	parsedDeployedVersion, err := tagcmp.Parse(deployMeta.Version)
+	if err != nil {
+		return false, err
+	}
+
+	for _, version := range versions {
+		parsedVersion, err := tagcmp.Parse(version)
+		if err != nil {
+			return false, err
+		}
+
+		if parsedVersion.IsGreaterThan(parsedDeployedVersion) &&
+			!(parsedVersion.Equals(parsedDeployedVersion)) {
+			*availableUpgrades = append(*availableUpgrades, version)
+		}
+	}
+
+	if len(*availableUpgrades) == 0 && !internal.Force {
+		return false, nil
+	}
+
+	return true, nil
+}
+
+// validateUpgradeVersionArg validates the specific version.
+func validateUpgradeVersionArg(
+	specificVersion string,
+	app app.App,
+	deployMeta stack.DeployMeta,
+) error {
+	parsedSpecificVersion, err := tagcmp.Parse(specificVersion)
+	if err != nil {
+		return fmt.Errorf("'%s' is not a known version for %s", specificVersion, app.Recipe.Name)
+	}
+
+	parsedDeployedVersion, err := tagcmp.Parse(deployMeta.Version)
+	if err != nil {
+		return err
+	}
+
+	if parsedSpecificVersion.IsLessThan(parsedDeployedVersion) &&
+		!parsedSpecificVersion.Equals(parsedDeployedVersion) {
+		return fmt.Errorf("%s is not an upgrade for %s?", deployMeta.Version, specificVersion)
+	}
+
+	if parsedSpecificVersion.Equals(parsedDeployedVersion) && !internal.Force {
+		return fmt.Errorf("%s is not an upgrade for %s?", deployMeta.Version, specificVersion)
+	}
+
+	return nil
+}
+
+// ensureDeployed ensures the app is deployed and if so, returns deployment
+// meta info.
+func ensureDeployed(cl *dockerClient.Client, app app.App) (stack.DeployMeta, error) {
+	log.Debugf("checking whether %s is already deployed", app.StackName())
+
+	deployMeta, err := stack.IsDeployed(context.Background(), cl, app.StackName())
+	if err != nil {
+		return stack.DeployMeta{}, err
+	}
+
+	if !deployMeta.IsDeployed {
+		return stack.DeployMeta{}, fmt.Errorf("%s is not deployed?", app.Name)
+	}
+
+	return deployMeta, nil
+}
+
 var (
 	showReleaseNotes bool
 )
@@ -321,7 +429,7 @@ func init() {
 		&internal.DontWaitConverge, "no-converge-checks",
 		"c",
 		false,
-		"do not wait for converge logic checks",
+		"disable converge logic checks",
 	)
 
 	AppUpgradeCommand.Flags().BoolVarP(

cli/app/volume.go

@@ -14,7 +14,7 @@ import (
 )
 
 var AppVolumeListCommand = &cobra.Command{
-	Use:     "list <app> [flags]",
+	Use:     "list <domain> [flags]",
 	Aliases: []string{"ls"},
 	Short:   "List volumes associated with an app",
 	Args:    cobra.ExactArgs(1),
@@ -71,12 +71,12 @@ var AppVolumeListCommand = &cobra.Command{
 }
 
 var AppVolumeRemoveCommand = &cobra.Command{
-	Use:   "remove <app> [flags]",
+	Use:   "remove <domain> [flags]",
 	Short: "Remove volume(s) associated with an app",
 	Long: `Remove volumes associated with an app.
 
 The app in question must be undeployed before you try to remove volumes. See
-"abra app undeploy <app>" for more.
+"abra app undeploy <domain>" for more.
 
 The command is interactive and will show a multiple select input which allows
 you to make a seclection. Use the "?" key to see more help on navigating this

cli/catalogue/catalogue.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"path"
+	"slices"
 
 	"coopcloud.tech/abra/cli/internal"
 	"coopcloud.tech/abra/pkg/autocomplete"
@@ -24,12 +25,17 @@ var CatalogueGenerateCommand = &cobra.Command{
 	Short:   "Generate the recipe catalogue",
 	Long: `Generate a new copy of the recipe catalogue.
 
+N.B. this command **will** wipe local unstaged changes from your local recipes
+if present. "--chaos/-C" on this command refers to the catalogue repository
+("$ABRA_DIR/catalogue") and not the recipes. Please take care not to lose your
+changes.
+
 It is possible to generate new metadata for a single recipe by passing
 [recipe]. The existing local catalogue will be updated, not overwritten.
 
 It is quite easy to get rate limited by Docker Hub when running this command.
-If you have a Hub account you can have Abra log you in to avoid this. Pass
-"--user" and "--pass".
+If you have a Hub account you can "docker login" and Abra will automatically
+use those details.
 
 Push your new release to git.coopcloud.tech with "--publish/-p". This requires
 that you have permission to git push to these repositories and have your SSH
@@ -47,56 +53,62 @@ keys configured on your account.`,
 			recipeName = args[0]
 		}
 
-		r := recipe.Get(recipeName)
-
 		if recipeName != "" {
 			internal.ValidateRecipe(args, cmd.Name())
 		}
 
+		if err := catalogue.EnsureCatalogue(); err != nil {
+			log.Fatal(err)
+		}
+
 		if !internal.Chaos {
 			if err := catalogue.EnsureIsClean(); err != nil {
 				log.Fatal(err)
 			}
 		}
 
-		repos, err := recipe.ReadReposMetadata()
+		repos, err := recipe.ReadReposMetadata(internal.Debug)
 		if err != nil {
 			log.Fatal(err)
 		}
 
-		var barLength int
-		var logMsg string
+		barLength := len(repos)
 		if recipeName != "" {
 			barLength = 1
-			logMsg = fmt.Sprintf("ensuring %v recipe is cloned & up-to-date", barLength)
-		} else {
-			barLength = len(repos)
-			logMsg = fmt.Sprintf("ensuring %v recipes are cloned & up-to-date, this could take some time...", barLength)
 		}
 
 		if !skipUpdates {
-			log.Warn(logMsg)
-			if err := recipe.UpdateRepositories(repos, recipeName); err != nil {
+			if err := recipe.UpdateRepositories(repos, recipeName, internal.Debug); err != nil {
 				log.Fatal(err)
 			}
 		}
 
+		var warnings []string
 		catl := make(recipe.RecipeCatalogue)
-		catlBar := formatter.CreateProgressbar(barLength, "generating catalogue metadata...")
+		catlBar := formatter.CreateProgressbar(barLength, "collecting catalogue metadata")
 		for _, recipeMeta := range repos {
 			if recipeName != "" && recipeName != recipeMeta.Name {
+				if !internal.Debug {
 					catlBar.Add(1)
+				}
 				continue
 			}
 
-			versions, err := r.GetRecipeVersions()
+			r := recipe.Get(recipeMeta.Name)
+			versions, warnMsgs, err := r.GetRecipeVersions()
 			if err != nil {
-				log.Warn(err)
+				warnings = append(warnings, err.Error())
+			}
+			if len(warnMsgs) > 0 {
+				warnings = append(warnings, warnMsgs...)
 			}
 
-			features, category, err := recipe.GetRecipeFeaturesAndCategory(r)
+			features, category, warnMsgs, err := recipe.GetRecipeFeaturesAndCategory(r)
 			if err != nil {
-				log.Warn(err)
+				warnings = append(warnings, err.Error())
+			}
+			if len(warnMsgs) > 0 {
+				warnings = append(warnings, warnMsgs...)
 			}
 
 			catl[recipeMeta.Name] = recipe.RecipeMeta{
@@ -112,8 +124,25 @@ keys configured on your account.`,
 				Features:      features,
 			}
 
+			if !internal.Debug {
 				catlBar.Add(1)
 			}
+		}
+
+		if err := catlBar.Close(); err != nil {
+			log.Fatal(err)
+		}
+
+		var uniqueWarnings []string
+		for _, w := range warnings {
+			if !slices.Contains(uniqueWarnings, w) {
+				uniqueWarnings = append(uniqueWarnings, w)
+			}
+		}
+
+		for _, warnMsg := range uniqueWarnings {
+			log.Warn(warnMsg)
+		}
 
 		recipesJSON, err := json.MarshalIndent(catl, "", "    ")
 		if err != nil {
@@ -142,7 +171,7 @@ keys configured on your account.`,
 			}
 		}
 
-		log.Infof("generated new recipe catalogue in %s", config.RECIPES_JSON)
+		log.Infof("generated recipe catalogue: %s", config.RECIPES_JSON)
 
 		cataloguePath := path.Join(config.ABRA_DIR, "catalogue")
 		if publishChanges {
@@ -168,7 +197,7 @@ keys configured on your account.`,
 				log.Fatal(err)
 			}
 
-			sshURL := fmt.Sprintf(config.SSH_URL_TEMPLATE, config.CATALOGUE_JSON_REPO_NAME)
+			sshURL := fmt.Sprintf(config.TOOLSHED_SSH_URL_TEMPLATE, config.CATALOGUE_JSON_REPO_NAME)
 			if err := gitPkg.CreateRemote(repo, "origin-ssh", sshURL, internal.Dry); err != nil {
 				log.Fatal(err)
 			}

cli/complete.go

@@ -12,17 +12,16 @@ var AutocompleteCommand = &cobra.Command{
 	Long: `To load completions:
 
 Bash:
-
+  # Load autocompletion for the current Bash session
   $ source <(abra autocomplete bash)
 
   # To load autocompletion for each session, execute once:
   # Linux:
-  $ abra autocomplete bash > /etc/bash_completion.d/abra
+  $ abra autocomplete bash | sudo tee /etc/bash_completion.d/abra
   # macOS:
-  $ abra autocomplete bash > $(brew --prefix)/etc/bash_completion.d/abra
+  $ abra autocomplete bash | sudo tee $(brew --prefix)/etc/bash_completion.d/abra
 
 Zsh:
-
   # If shell autocompletion is not already enabled in your environment,
   # you will need to enable it.  You can execute the following once:
 
@@ -34,14 +33,12 @@ Zsh:
   # You will need to start a new shell for this setup to take effect.
 
 fish:
-
   $ abra autocomplete fish | source
 
   # To load autocompletions for each session, execute once:
   $ abra autocomplete fish > ~/.config/fish/completions/abra.fish
 
 PowerShell:
-
   PS> abra autocomplete powershell | Out-String | Invoke-Expression
 
   # To load autocompletions for every new session, run:

cli/internal/cli.go

@@ -5,6 +5,7 @@ var (
 	Debug            bool
 	NoInput          bool
 	Offline          bool
+	IgnoreEnvVersion bool
 
 	// NOTE(d1): sub-command specific
 	Chaos            bool

cli/internal/deploy.go

@@ -10,6 +10,7 @@ import (
 	"coopcloud.tech/abra/pkg/config"
 	"coopcloud.tech/abra/pkg/formatter"
 	"coopcloud.tech/abra/pkg/log"
+	"coopcloud.tech/abra/pkg/recipe"
 	"coopcloud.tech/tagcmp"
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/charmbracelet/lipgloss"
@@ -48,7 +49,7 @@ func NewVersionOverview(
 	releaseNotes string) error {
 	deployConfig := "compose.yml"
 	if composeFiles, ok := app.Env["COMPOSE_FILE"]; ok {
-		deployConfig = composeFiles
+		deployConfig = formatComposeFiles(composeFiles)
 	}
 
 	server := app.Server
@@ -61,18 +62,37 @@ func NewVersionOverview(
 		domain = config.NO_DOMAIN_DEFAULT
 	}
 
+	upperKind := strings.ToUpper(kind)
+
+	envVersion, err := recipe.GetEnvVersionRaw(app.Recipe.Name)
+	if err != nil {
+		return err
+	}
+
+	if envVersion == "" {
+		envVersion = config.NO_VERSION_DEFAULT
+	}
+
 	rows := [][]string{
-		[]string{"APP", domain},
-		[]string{"RECIPE", app.Recipe.Name},
-		[]string{"SERVER", server},
-		[]string{"DEPLOYED", deployedVersion},
-		[]string{"CURRENT CHAOS ", deployedChaosVersion},
-		[]string{fmt.Sprintf("TO %s", strings.ToUpper(kind)), toDeployVersion},
-		[]string{"CONFIG", deployConfig},
+		{"DOMAIN", domain},
+		{"RECIPE", app.Recipe.Name},
+		{"SERVER", server},
+		{"CONFIG", deployConfig},
+
+		{"CURRENT DEPLOYMENT", "---"},
+		{"VERSION", formatter.BoldDirtyDefault(deployedVersion)},
+		{"CHAOS ", formatter.BoldDirtyDefault(deployedChaosVersion)},
+
+		{upperKind, "---"},
+		{"VERSION", formatter.BoldDirtyDefault(toDeployVersion)},
+
+		{fmt.Sprintf("%s.ENV", strings.ToUpper(app.Domain)), "---"},
+		{"CURRENT VERSION", formatter.BoldDirtyDefault(envVersion)},
+		{"NEW VERSION", formatter.BoldDirtyDefault(toDeployVersion)},
 	}
 
 	overview := formatter.CreateOverview(
-		fmt.Sprintf("%s OVERVIEW", strings.ToUpper(kind)),
+		fmt.Sprintf("%s OVERVIEW", upperKind),
 		rows,
 	)
 
@@ -108,6 +128,10 @@ func NewVersionOverview(
 	return nil
 }
 
+func formatComposeFiles(composeFiles string) string {
+	return strings.ReplaceAll(composeFiles, ":", "\n")
+}
+
 // DeployOverview shows a deployment overview
 func DeployOverview(
 	app appPkg.App,
@@ -115,10 +139,12 @@ func DeployOverview(
 	deployedVersion string,
 	deployedChaosVersion string,
 	toDeployVersion,
-	toDeployChaosVersion string) error {
+	toDeployChaosVersion string,
+	toWriteVersion string,
+) error {
 	deployConfig := "compose.yml"
 	if composeFiles, ok := app.Env["COMPOSE_FILE"]; ok {
-		deployConfig = composeFiles
+		deployConfig = formatComposeFiles(composeFiles)
 	}
 
 	server := app.Server
@@ -131,15 +157,42 @@ func DeployOverview(
 		domain = config.NO_DOMAIN_DEFAULT
 	}
 
+	if app.Recipe.Dirty {
+		toWriteVersion = formatter.AddDirtyMarker(toWriteVersion)
+		toDeployChaosVersion = formatter.AddDirtyMarker(toDeployChaosVersion)
+	}
+
+	recipeName, exists := app.Env["RECIPE"]
+	if !exists {
+		recipeName = app.Env["TYPE"]
+	}
+
+	envVersion, err := recipe.GetEnvVersionRaw(recipeName)
+	if err != nil {
+		return err
+	}
+
+	if envVersion == "" {
+		envVersion = config.NO_VERSION_DEFAULT
+	}
+
 	rows := [][]string{
-		[]string{"APP", domain},
-		[]string{"RECIPE", app.Recipe.Name},
-		[]string{"SERVER", server},
-		[]string{"DEPLOYED", deployedVersion},
-		[]string{"CURRENT CHAOS ", deployedChaosVersion},
-		[]string{"TO DEPLOY", toDeployVersion},
-		[]string{"NEW CHAOS", toDeployChaosVersion},
-		[]string{"CONFIG", deployConfig},
+		{"DOMAIN", domain},
+		{"RECIPE", app.Recipe.Name},
+		{"SERVER", server},
+		{"CONFIG", deployConfig},
+
+		{"CURRENT DEPLOYMENT", "---"},
+		{"VERSION", formatter.BoldDirtyDefault(deployedVersion)},
+		{"CHAOS", formatter.BoldDirtyDefault(deployedChaosVersion)},
+
+		{"NEW DEPLOYMENT", "---"},
+		{"VERSION", formatter.BoldDirtyDefault(toDeployVersion)},
+		{"CHAOS", formatter.BoldDirtyDefault(toDeployChaosVersion)},
+
+		{fmt.Sprintf("%s.ENV", strings.ToUpper(app.Name)), "---"},
+		{"CURRENT VERSION", formatter.BoldDirtyDefault(envVersion)},
+		{"NEW VERSION", formatter.BoldDirtyDefault(toWriteVersion)},
 	}
 
 	overview := formatter.CreateOverview("DEPLOY OVERVIEW", rows)
@@ -170,11 +223,13 @@ func DeployOverview(
 // UndeployOverview shows an undeployment overview
 func UndeployOverview(
 	app appPkg.App,
-	version,
-	chaosVersion string) error {
+	deployedVersion,
+	deployedChaosVersion,
+	toWriteVersion string,
+) error {
 	deployConfig := "compose.yml"
 	if composeFiles, ok := app.Env["COMPOSE_FILE"]; ok {
-		deployConfig = composeFiles
+		deployConfig = formatComposeFiles(composeFiles)
 	}
 
 	server := app.Server
@@ -187,13 +242,33 @@ func UndeployOverview(
 		domain = config.NO_DOMAIN_DEFAULT
 	}
 
+	recipeName, exists := app.Env["RECIPE"]
+	if !exists {
+		recipeName = app.Env["TYPE"]
+	}
+
+	envVersion, err := recipe.GetEnvVersionRaw(recipeName)
+	if err != nil {
+		return err
+	}
+
+	if envVersion == "" {
+		envVersion = config.NO_VERSION_DEFAULT
+	}
+
 	rows := [][]string{
-		[]string{"APP", domain},
-		[]string{"RECIPE", app.Recipe.Name},
-		[]string{"SERVER", server},
-		[]string{"DEPLOYED", version},
-		[]string{"CHAOS", chaosVersion},
-		[]string{"CONFIG", deployConfig},
+		{"DOMAIN", domain},
+		{"RECIPE", app.Recipe.Name},
+		{"SERVER", server},
+		{"CONFIG", deployConfig},
+
+		{"CURRENT DEPLOYMENT", "---"},
+		{"VERSION", formatter.BoldDirtyDefault(deployedVersion)},
+		{"CHAOS", formatter.BoldDirtyDefault(deployedChaosVersion)},
+
+		{fmt.Sprintf("%s.ENV", strings.ToUpper(app.Name)), "---"},
+		{"CURRENT VERSION", formatter.BoldDirtyDefault(envVersion)},
+		{"NEW VERSION", formatter.BoldDirtyDefault(toWriteVersion)},
 	}
 
 	overview := formatter.CreateOverview("UNDEPLOY OVERVIEW", rows)

cli/internal/deploy_test.go

@@ -0,0 +1,17 @@
+package internal
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestSortVersionsDesc(t *testing.T) {
+	versions := SortVersionsDesc([]string{
+		"0.2.3+1.2.2",
+		"1.0.0+2.2.2",
+	})
+
+	assert.Equal(t, "1.0.0+2.2.2", versions[0])
+	assert.Equal(t, "0.2.3+1.2.2", versions[1])
+}

cli/internal/ensure.go

@@ -0,0 +1,11 @@
+package internal
+
+import "coopcloud.tech/abra/pkg/recipe"
+
+func GetEnsureContext() recipe.EnsureContext {
+	return recipe.EnsureContext{
+		Chaos,
+		Offline,
+		IgnoreEnvVersion,
+	}
+}

cli/internal/errors.go

@@ -1,18 +0,0 @@
-package internal
-
-import (
-	"os"
-
-	"coopcloud.tech/abra/pkg/log"
-	"github.com/urfave/cli/v3"
-)
-
-// ShowSubcommandHelpAndError exits the program on error, logs the error to the
-// terminal, and shows the help command.
-func ShowSubcommandHelpAndError(cmd *cli.Command, err interface{}) {
-	if err2 := cli.ShowSubcommandHelp(cmd); err2 != nil {
-		log.Error(err2)
-	}
-	log.Error(err)
-	os.Exit(1)
-}

cli/recipe/diff.go

@@ -1,8 +1,6 @@
 package recipe
 
 import (
-	"fmt"
-
 	"coopcloud.tech/abra/cli/internal"
 	"coopcloud.tech/abra/pkg/autocomplete"
 	gitPkg "coopcloud.tech/abra/pkg/git"
@@ -24,12 +22,8 @@ var RecipeDiffCommand = &cobra.Command{
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		r := internal.ValidateRecipe(args, cmd.Name())
-		diff, err := gitPkg.DiffUnstaged(r.Dir, "")
-		if err != nil {
+		if err := gitPkg.DiffUnstaged(r.Dir); err != nil {
 			log.Fatal(err)
 		}
-		if diff != "" {
-			fmt.Print(diff)
-		}
 	},
 }

cli/recipe/fetch.go

@@ -34,9 +34,10 @@ var RecipeFetchCommand = &cobra.Command{
 			log.Fatal("cannot use [recipe] and --all/-a together")
 		}
 
+		ensureCtx := internal.GetEnsureContext()
 		if recipeName != "" {
 			r := internal.ValidateRecipe(args, cmd.Name())
-			if err := r.Ensure(false, false); err != nil {
+			if err := r.Ensure(ensureCtx); err != nil {
 				log.Fatal(err)
 			}
 			return
@@ -50,7 +51,7 @@ var RecipeFetchCommand = &cobra.Command{
 		catlBar := formatter.CreateProgressbar(len(catalogue), "fetching latest recipes...")
 		for recipeName := range catalogue {
 			r := recipe.Get(recipeName)
-			if err := r.Ensure(false, false); err != nil {
+			if err := r.Ensure(ensureCtx); err != nil {
 				log.Error(err)
 			}
 			catlBar.Add(1)

cli/recipe/lint.go

@@ -23,7 +23,7 @@ var RecipeLintCommand = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		recipe := internal.ValidateRecipe(args, cmd.Name())
 
-		if err := recipe.Ensure(internal.Chaos, internal.Offline); err != nil {
+		if err := recipe.Ensure(internal.GetEnsureContext()); err != nil {
 			log.Fatal(err)
 		}
 

cli/recipe/new.go

@@ -58,7 +58,7 @@ var RecipeNewCommand = &cobra.Command{
 		if err := os.RemoveAll(gitRepo); err != nil {
 			log.Fatal(err)
 		}
-		log.Debugf("removed example git repo in %s", gitRepo)
+		log.Debugf("removed .git repo in %s", gitRepo)
 
 		meta := newRecipeMeta(recipeName)
 
@@ -76,7 +76,6 @@ var RecipeNewCommand = &cobra.Command{
 			if err := os.WriteFile(path, templated.Bytes(), 0o644); err != nil {
 				log.Fatal(err)
 			}
-
 		}
 
 		if err := git.Init(r.Dir, true, gitName, gitEmail); err != nil {

cli/recipe/release.go

@@ -118,13 +118,9 @@ your SSH keys configured on your account.`,
 
 		if !isClean {
 			log.Infof("%s currently has these unstaged changes 👇", recipe.Name)
-			diff, err := gitPkg.DiffUnstaged(recipe.Dir, "")
-			if err != nil {
+			if err := gitPkg.DiffUnstaged(recipe.Dir); err != nil {
 				log.Fatal(err)
 			}
-			if diff != "" {
-				fmt.Print(diff)
-			}
 		}
 
 		if len(tags) > 0 {
@@ -271,6 +267,8 @@ func addReleaseNotes(recipe recipe.Recipe, tag string) error {
 		return err
 	}
 
+	var addNextAsReleaseNotes bool
+
 	nextReleaseNotePath := path.Join(releaseDir, "next")
 	if _, err := os.Stat(nextReleaseNotePath); err == nil {
 		// release/next note exists. Move it to release/<tag>
@@ -280,38 +278,37 @@ func addReleaseNotes(recipe recipe.Recipe, tag string) error {
 		}
 
 		if !internal.NoInput {
-			prompt := &survey.Input{
+			prompt := &survey.Confirm{
 				Message: "Use release note in release/next?",
 			}
-			var addReleaseNote bool
-			if err := survey.AskOne(prompt, &addReleaseNote); err != nil {
+
+			if err := survey.AskOne(prompt, &addNextAsReleaseNotes); err != nil {
 				return err
 			}
-			if !addReleaseNote {
+
+			if !addNextAsReleaseNotes {
 				return nil
 			}
 		}
 
-		err := os.Rename(nextReleaseNotePath, tagReleaseNotePath)
-		if err != nil {
+		if err := os.Rename(nextReleaseNotePath, tagReleaseNotePath); err != nil {
 			return err
 		}
 
-		err = gitPkg.Add(recipe.Dir, path.Join("release", "next"), internal.Dry)
-		if err != nil {
+		if err := gitPkg.Add(recipe.Dir, path.Join("release", "next"), internal.Dry); err != nil {
 			return err
 		}
 
-		err = gitPkg.Add(recipe.Dir, path.Join("release", tag), internal.Dry)
-		if err != nil {
+		if err := gitPkg.Add(recipe.Dir, path.Join("release", tag), internal.Dry); err != nil {
 			return err
 		}
 	} else if !errors.Is(err, os.ErrNotExist) {
 		return err
 	}
 
-	// No release note exists for the current release.
-	if internal.NoInput {
+	// NOTE(d1): No release note exists for the current release. Or, we've
+	// already used release/next as the release note
+	if internal.NoInput || addNextAsReleaseNotes {
 		return nil
 	}
 

cli/recipe/sync.go

@@ -208,13 +208,9 @@ likely to change.
 		}
 		if !isClean {
 			log.Infof("%s currently has these unstaged changes 👇", recipe.Name)
-			diff, err := gitPkg.DiffUnstaged(recipe.Dir, "")
-			if err != nil {
+			if err := gitPkg.DiffUnstaged(recipe.Dir); err != nil {
 				log.Fatal(err)
 			}
-			if diff != "" {
-				fmt.Print(diff)
-			}
 		}
 	},
 }

cli/recipe/upgrade.go

@@ -63,7 +63,7 @@ You may invoke this command in "wizard" mode and be prompted for input.`,
 	Run: func(cmd *cobra.Command, args []string) {
 		recipe := internal.ValidateRecipe(args, cmd.Name())
 
-		if err := recipe.Ensure(internal.Chaos, internal.Offline); err != nil {
+		if err := recipe.Ensure(internal.GetEnsureContext()); err != nil {
 			log.Fatal(err)
 		}
 
@@ -327,13 +327,9 @@ You may invoke this command in "wizard" mode and be prompted for input.`,
 		}
 		if !isClean {
 			log.Infof("%s currently has these unstaged changes 👇", recipe.Name)
-			diff, err := gitPkg.DiffUnstaged(recipe.Dir, "")
-			if err != nil {
+			if err := gitPkg.DiffUnstaged(recipe.Dir); err != nil {
 				log.Fatal(err)
 			}
-			if diff != "" {
-				fmt.Print(diff)
-			}
 		}
 	},
 }

cli/recipe/version.go

@@ -37,10 +37,13 @@ var RecipeVersionCommand = &cobra.Command{
 		if !ok {
 			warnMessages = append(warnMessages, "retrieved versions from local recipe repository")
 
-			recipeVersions, err := recipe.GetRecipeVersions()
+			recipeVersions, warnMsg, err := recipe.GetRecipeVersions()
 			if err != nil {
 				warnMessages = append(warnMessages, err.Error())
 			}
+			if len(warnMsg) > 0 {
+				warnMessages = append(warnMessages, warnMsg...)
+			}
 
 			recipeMeta = recipePkg.RecipeMeta{Versions: recipeVersions}
 		}

cli/run.go

@@ -35,6 +35,7 @@ func Run(version, commit string) {
 				config.ABRA_DIR,
 				config.SERVERS_DIR,
 				config.RECIPES_DIR,
+				config.LOGS_DIR,
 				config.VENDOR_DIR, // TODO(d1): remove > 0.9.x
 				config.BACKUP_DIR, // TODO(d1): remove > 0.9.x
 			}
@@ -48,9 +49,13 @@ func Run(version, commit string) {
 				}
 			}
 
-			log.Logger.SetStyles(log.Styles())
+			log.Logger.SetStyles(charmLog.DefaultStyles())
 			charmLog.SetDefault(log.Logger)
 
+			if internal.MachineReadable {
+				log.SetOutput(os.Stderr)
+			}
+
 			if internal.Debug {
 				log.SetLevel(log.DebugLevel)
 				log.SetOutput(os.Stderr)
@@ -95,20 +100,37 @@ func Run(version, commit string) {
 	}
 
 	rootCmd.PersistentFlags().BoolVarP(
-		&internal.Debug, "debug", "d", false,
+		&internal.Debug,
+		"debug",
+		"d",
+		false,
 		"show debug messages",
 	)
 
 	rootCmd.PersistentFlags().BoolVarP(
-		&internal.NoInput, "no-input", "n", false,
+		&internal.NoInput,
+		"no-input",
+		"n",
+		false,
 		"toggle non-interactive mode",
 	)
 
 	rootCmd.PersistentFlags().BoolVarP(
-		&internal.Offline, "offline", "o", false,
+		&internal.Offline,
+		"offline",
+		"o",
+		false,
 		"prefer offline & filesystem access",
 	)
 
+	rootCmd.PersistentFlags().BoolVarP(
+		&internal.IgnoreEnvVersion,
+		"ignore-env-version",
+		"i",
+		false,
+		"ignore .env version checkout",
+	)
+
 	catalogue.CatalogueCommand.AddCommand(
 		catalogue.CatalogueGenerateCommand,
 	)
@@ -187,8 +209,8 @@ func Run(version, commit string) {
 		app.AppUndeployCommand,
 		app.AppUpgradeCommand,
 		app.AppVolumeCommand,
-		app.AppDiffCommand,
-		app.AppPushCommand,
+		app.AppLabelsCommand,
+		app.AppEnvCommand,
 	)
 
 	if err := rootCmd.Execute(); err != nil {

cli/updater/updater.go

@@ -441,7 +441,14 @@ func upgrade(cl *dockerclient.Client, stackName, recipeName, upgradeVersion stri
 
 	log.Infof("upgrade %s (%s) to version %s", stackName, recipeName, upgradeVersion)
 
-	err = stack.RunDeploy(cl, deployOpts, compose, stackName, true)
+	err = stack.RunDeploy(
+		cl,
+		deployOpts,
+		compose,
+		stackName,
+		app.Server,
+		true,
+	)
 
 	return err
 }
@@ -452,7 +459,7 @@ func newKadabraApp(version, commit string) *cobra.Command {
 		Version: fmt.Sprintf("%s-%s", version, commit[:7]),
 		Short:   "The Co-op Cloud auto-updater 🤖 🚀",
 		PersistentPreRun: func(cmd *cobra.Command, args []string) {
-			log.Logger.SetStyles(log.Styles())
+			log.Logger.SetStyles(charmLog.DefaultStyles())
 			charmLog.SetDefault(log.Logger)
 
 			if internal.Debug {

go.mod

@@ -4,26 +4,25 @@ go 1.22.7
 
 toolchain go1.23.1
 
-replace github.com/urfave/cli/v3 => github.com/urfave/cli/v3 v3.0.0-alpha9.1.0.20241019193437-5053ec708a44
-
 require (
 	coopcloud.tech/tagcmp v0.0.0-20230809071031-eb3e7758d4eb
-	git.coopcloud.tech/coop-cloud/godotenv v1.5.2-0.20231130100509-01bff8284355
+	git.coopcloud.tech/toolshed/godotenv v1.5.2-0.20250103171850-4d0ca41daa5c
 	github.com/AlecAivazis/survey/v2 v2.3.7
+	github.com/charmbracelet/bubbletea v1.2.4
 	github.com/charmbracelet/lipgloss v1.0.0
 	github.com/charmbracelet/log v0.4.0
 	github.com/distribution/reference v0.6.0
 	github.com/docker/cli v27.4.1+incompatible
 	github.com/docker/docker v27.4.1+incompatible
 	github.com/docker/go-units v0.5.0
-	github.com/go-git/go-git/v5 v5.12.0
+	github.com/go-git/go-git/v5 v5.13.1
 	github.com/google/go-cmp v0.6.0
 	github.com/moby/sys/signal v0.7.1
-	github.com/moby/term v0.5.0
+	github.com/moby/term v0.5.2
+	github.com/muesli/reflow v0.3.0
 	github.com/pkg/errors v0.9.1
 	github.com/schollz/progressbar/v3 v3.17.1
-	github.com/urfave/cli/v3 v3.0.0-alpha9
-	golang.org/x/term v0.27.0
+	golang.org/x/term v0.28.0
 	gopkg.in/yaml.v3 v3.0.1
 	gotest.tools/v3 v3.5.1
 )
@@ -31,7 +30,7 @@ require (
 require (
 	dario.cat/mergo v1.0.1 // indirect
 	github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
-	github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
+	github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
 	github.com/BurntSushi/toml v1.4.0 // indirect
 	github.com/Microsoft/go-winio v0.6.2 // indirect
 	github.com/ProtonMail/go-crypto v1.1.3 // indirect
@@ -40,6 +39,8 @@ require (
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/charmbracelet/x/ansi v0.6.0 // indirect
+	github.com/charmbracelet/x/exp/golden v0.0.0-20240815200342-61de596daa2b // indirect
+	github.com/charmbracelet/x/term v0.2.1 // indirect
 	github.com/cloudflare/circl v1.5.0 // indirect
 	github.com/containerd/log v0.1.0 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
@@ -51,11 +52,12 @@ require (
 	github.com/docker/go-metrics v0.0.1 // indirect
 	github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
+	github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/ghodss/yaml v1.0.0 // indirect
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
-	github.com/go-git/go-billy/v5 v5.6.0 // indirect
+	github.com/go-git/go-billy/v5 v5.6.1 // indirect
 	github.com/go-logfmt/logfmt v0.6.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
@@ -73,23 +75,27 @@ require (
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mattn/go-localereader v0.0.1 // indirect
 	github.com/mattn/go-runewidth v0.0.16 // indirect
 	github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
 	github.com/miekg/pkcs11 v1.1.1 // indirect
 	github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/mmcloughlin/avo v0.6.0 // indirect
 	github.com/moby/docker-image-spec v1.3.1 // indirect
 	github.com/moby/sys/mountinfo v0.6.2 // indirect
 	github.com/moby/sys/user v0.3.0 // indirect
 	github.com/moby/sys/userns v0.1.0 // indirect
 	github.com/morikuni/aec v1.0.0 // indirect
+	github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
+	github.com/muesli/cancelreader v0.2.2 // indirect
 	github.com/muesli/termenv v0.15.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/runc v1.1.13 // indirect
 	github.com/opencontainers/runtime-spec v1.1.0 // indirect
 	github.com/pelletier/go-toml v1.9.5 // indirect
-	github.com/pjbgf/sha1cd v0.3.0 // indirect
+	github.com/pjbgf/sha1cd v0.3.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/client_model v0.6.1 // indirect
 	github.com/prometheus/common v0.61.0 // indirect
@@ -113,17 +119,19 @@ require (
 	go.opentelemetry.io/otel/sdk v1.33.0 // indirect
 	go.opentelemetry.io/otel/sdk/metric v1.33.0 // indirect
 	go.opentelemetry.io/otel/trace v1.33.0 // indirect
-	go.opentelemetry.io/proto/otlp v1.4.0 // indirect
-	golang.org/x/crypto v0.31.0 // indirect
-	golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
-	golang.org/x/net v0.33.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.5.0 // indirect
+	golang.org/x/crypto v0.32.0 // indirect
+	golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect
+	golang.org/x/mod v0.22.0 // indirect
+	golang.org/x/net v0.34.0 // indirect
 	golang.org/x/sync v0.10.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
-	golang.org/x/time v0.8.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20241223144023-3abc09e42ca8 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8 // indirect
+	golang.org/x/time v0.9.0 // indirect
+	golang.org/x/tools v0.29.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422 // indirect
 	google.golang.org/grpc v1.69.2 // indirect
-	google.golang.org/protobuf v1.36.1 // indirect
+	google.golang.org/protobuf v1.36.2 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
@@ -146,5 +154,5 @@ require (
 	github.com/stretchr/testify v1.10.0
 	github.com/theupdateframework/notary v0.7.0 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
-	golang.org/x/sys v0.28.0
+	golang.org/x/sys v0.29.0
 )

go.sum

@@ -27,16 +27,16 @@ coopcloud.tech/tagcmp v0.0.0-20230809071031-eb3e7758d4eb/go.mod h1:ESVm0wQKcbcFi
 dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
 dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-git.coopcloud.tech/coop-cloud/godotenv v1.5.2-0.20231130100509-01bff8284355 h1:tCv2B4qoN6RMheKDnCzIafOkWS5BB1h7hwhmo+9bVeE=
-git.coopcloud.tech/coop-cloud/godotenv v1.5.2-0.20231130100509-01bff8284355/go.mod h1:Q8V1zbtPAlzYSr/Dvky3wS6x58IQAl3rot2me1oSO2Q=
+git.coopcloud.tech/toolshed/godotenv v1.5.2-0.20250103171850-4d0ca41daa5c h1:oeKnUB79PKYD8D0/unYuu7MRcWryQQWOns8+JL+acrs=
+git.coopcloud.tech/toolshed/godotenv v1.5.2-0.20250103171850-4d0ca41daa5c/go.mod h1:fQuhwrpg6qb9NlFXKYi/LysWu1wxjraS8sxyW12CUF0=
 github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9vkmnHYOMsOr4WLk+Vo07yKIzd94sVoIqshQ4bU=
 github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8=
 github.com/AlecAivazis/survey/v2 v2.3.7 h1:6I/u8FvytdGsgonrYsVn2t8t4QiRnh6QSTqkkhIiSjQ=
 github.com/AlecAivazis/survey/v2 v2.3.7/go.mod h1:xUTIdE4KCOIjsBAE1JYsUPoCqYdZ1reCfTwbto0Fduo=
 github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
-github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0=
-github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
+github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c h1:udKWzYgxTojEKWjV8V+WSxDXJ4NFATAsZjh8iIbsQIg=
+github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
 github.com/Azure/go-autorest v10.8.1+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
 github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
 github.com/Azure/go-autorest/autorest v0.11.1/go.mod h1:JFgpikqFJ/MleTTxwepExTKnFUKKszPS8UavbQYUMuw=
@@ -131,21 +131,22 @@ github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInq
 github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
 github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/charmbracelet/bubbletea v1.2.4 h1:KN8aCViA0eps9SCOThb2/XPIlea3ANJLUkv3KnQRNCE=
+github.com/charmbracelet/bubbletea v1.2.4/go.mod h1:Qr6fVQw+wX7JkWWkVyXYk/ZUQ92a6XNekLXa3rR18MM=
 github.com/charmbracelet/lipgloss v1.0.0 h1:O7VkGDvqEdGi93X+DeqsQ7PKHDgtQfF8j8/O2qFMQNg=
 github.com/charmbracelet/lipgloss v1.0.0/go.mod h1:U5fy9Z+C38obMs+T+tJqst9VGzlOYGj4ri9reL3qUlo=
 github.com/charmbracelet/log v0.4.0 h1:G9bQAcx8rWA2T3pWvx7YtPTPwgqpk7D68BX21IRW8ZM=
 github.com/charmbracelet/log v0.4.0/go.mod h1:63bXt/djrizTec0l11H20t8FDSvA4CRZJ1KH22MdptM=
-github.com/charmbracelet/x/ansi v0.5.2 h1:dEa1x2qdOZXD/6439s+wF7xjV+kZLu/iN00GuXXrU9E=
-github.com/charmbracelet/x/ansi v0.5.2/go.mod h1:KBUFw1la39nl0dLl10l5ORDAqGXaeurTQmwyyVKse/Q=
 github.com/charmbracelet/x/ansi v0.6.0 h1:qOznutrb93gx9oMiGf7caF7bqqubh6YIM0SWKyA08pA=
 github.com/charmbracelet/x/ansi v0.6.0/go.mod h1:KBUFw1la39nl0dLl10l5ORDAqGXaeurTQmwyyVKse/Q=
-github.com/charmbracelet/x/exp/golden v0.0.0-20240806155701-69247e0abc2a h1:G99klV19u0QnhiizODirwVksQB91TJKV/UaTnACcG30=
-github.com/charmbracelet/x/exp/golden v0.0.0-20240806155701-69247e0abc2a/go.mod h1:wDlXFlCrmJ8J+swcL/MnGUuYnqgQdW9rhSD61oNMb6U=
+github.com/charmbracelet/x/exp/golden v0.0.0-20240815200342-61de596daa2b h1:MnAMdlwSltxJyULnrYbkZpp4k58Co7Tah3ciKhSNo0Q=
+github.com/charmbracelet/x/exp/golden v0.0.0-20240815200342-61de596daa2b/go.mod h1:wDlXFlCrmJ8J+swcL/MnGUuYnqgQdW9rhSD61oNMb6U=
+github.com/charmbracelet/x/term v0.2.1 h1:AQeHeLZ1OqSXhrAWpYUtZyX1T3zVxfpZuEQMIQaGIAQ=
+github.com/charmbracelet/x/term v0.2.1/go.mod h1:oQ4enTYFV7QN4m0i9mzHrViD7TQKvNEEkHUMCmsxdUg=
 github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod h1:xUQBLp4RLc5zJtWY++yjOoMoB5lihDt7fai+75m+rGw=
 github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod h1:cfwC0EG7HMUenopBsUf9d89JlCLQIfgVcNsNN0t6T2M=
 github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E=
@@ -278,7 +279,6 @@ github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfc
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
-github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4=
 github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/cpuguy83/go-md2man/v2 v2.0.6 h1:XJtiaUW6dEEqVuZiMTn1ldk455QWwEIsMIJlo5vtkx0=
 github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
@@ -289,8 +289,6 @@ github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
 github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
 github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
 github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
-github.com/cyphar/filepath-securejoin v0.3.4 h1:VBWugsJh2ZxJmLFSM06/0qzQyiQX2Qs0ViKrUAcqdZ8=
-github.com/cyphar/filepath-securejoin v0.3.4/go.mod h1:8s/MCNJREmFK0H02MF6Ihv1nakJe4L/w3WZLHNkvlYM=
 github.com/cyphar/filepath-securejoin v0.3.6 h1:4d9N5ykBnSp5Xn2JkhocYDkOpURL/18CYMpo6xB9uWM=
 github.com/cyphar/filepath-securejoin v0.3.6/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI=
 github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod h1:Ct2BUK8SB0YC1SMSibvLzxjeJLnrYEVLULFNiHY9YfQ=
@@ -311,8 +309,6 @@ github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5Qvfr
 github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
 github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=
 github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
-github.com/docker/cli v27.3.1+incompatible h1:qEGdFBF3Xu6SCvCYhc7CzaQTlBmqDuzxPDpigSyeKQQ=
-github.com/docker/cli v27.3.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
 github.com/docker/cli v27.4.1+incompatible h1:VzPiUlRJ/xh+otB75gva3r05isHMo5wXDfPRi5/b4hI=
 github.com/docker/cli v27.4.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
 github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY=
@@ -321,8 +317,6 @@ github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4Kfc
 github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
 github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
-github.com/docker/docker v27.3.1+incompatible h1:KttF0XoteNTicmUtBO0L2tP+J7FGRFTjaEF4k6WdhfI=
-github.com/docker/docker v27.3.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker v27.4.1+incompatible h1:ZJvcY7gfwHn1JF48PfbyXg7Jyt9ZCWDW+GGXOIxEwp4=
 github.com/docker/docker v27.4.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y=
@@ -350,8 +344,8 @@ github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:Htrtb
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/dvsekhvalnov/jose2go v0.0.0-20170216131308-f21a8cedbbae/go.mod h1:7BvyPhdbLxMXIYTFPLsyJRFMsKmOZnQmzh6Gb+uquuM=
 github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
-github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a h1:mATvB/9r/3gvcejNsXKSkQ6lcIaNec2nyfOdlTBR2lU=
-github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM=
+github.com/elazarl/goproxy v1.2.3 h1:xwIyKHbaP5yfT6O9KIeYJR5549MXRQkoQMRXGztz8YQ=
+github.com/elazarl/goproxy v1.2.3/go.mod h1:YfEbZtqP4AetfO6d40vWchF3znWX7C7Vd6ZMfdL8z64=
 github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
 github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
 github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
@@ -362,6 +356,8 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
 github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4=
+github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM=
 github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0=
 github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
@@ -382,16 +378,16 @@ github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYis
 github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/gliderlabs/ssh v0.3.7 h1:iV3Bqi942d9huXnzEF2Mt+CY9gLu8DNM4Obd+8bODRE=
-github.com/gliderlabs/ssh v0.3.7/go.mod h1:zpHEXBstFnQYtGnB8k8kQLol82umzn/2/snG7alWVD8=
+github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c=
+github.com/gliderlabs/ssh v0.3.8/go.mod h1:xYoytBv1sV0aL3CavoDuJIQNURXkkfPA/wxQ1pL1fAU=
 github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI=
 github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic=
-github.com/go-git/go-billy/v5 v5.6.0 h1:w2hPNtoehvJIxR00Vb4xX94qHQi/ApZfX+nBE2Cjio8=
-github.com/go-git/go-billy/v5 v5.6.0/go.mod h1:sFDq7xD3fn3E0GOwUSZqHo9lrkmx8xJhA0ZrfvjBRGM=
+github.com/go-git/go-billy/v5 v5.6.1 h1:u+dcrgaguSSkbjzHwelEjc0Yj300NUevrrPphk/SoRA=
+github.com/go-git/go-billy/v5 v5.6.1/go.mod h1:0AsLr1z2+Uksi4NlElmMblP5rPcDZNRCD8ujZCRR2BE=
 github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4=
 github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII=
-github.com/go-git/go-git/v5 v5.12.0 h1:7Md+ndsjrzZxbddRDZjF14qK+NN56sy6wkqaVrjZtys=
-github.com/go-git/go-git/v5 v5.12.0/go.mod h1:FTM9VKtnI2m65hNI/TenDDDnUf2Q9FHnXYjuz9i5OEY=
+github.com/go-git/go-git/v5 v5.13.1 h1:DAQ9APonnlvSWpvolXWIuV6Q6zXy2wHbN4cVlNR5Q+M=
+github.com/go-git/go-git/v5 v5.13.1/go.mod h1:qryJB4cSBoq3FRoBRf5A77joojuBcmPJ0qu3XXXVixc=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
@@ -529,10 +525,7 @@ github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
-github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 h1:TmHmbvxPmaegwhDubVz0lICL0J5Ka2vwTzhoePEXsGE=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0/go.mod h1:qztMSjm835F2bXf+5HKAPIS5qsmQDqZna/PgVt4rWtI=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 h1:VNqngBF40hVlDloBruUehVYC3ArSgIyScOAyMRqBxRg=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1/go.mod h1:RBRO7fro65R6tjKzYgLAFo0t1QEXY1Dp+i/bvpRiqiQ=
 github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed h1:5upAirOpQc1Q53c0bnx2ufif5kANL7bfZWcc6VJWJd8=
@@ -636,7 +629,10 @@ github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4=
+github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88=
 github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
+github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
 github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
 github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o=
@@ -662,6 +658,8 @@ github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A=
+github.com/mmcloughlin/avo v0.6.0 h1:QH6FU8SKoTLaVs80GA8TJuLNkUYl4VokHKlPhVDg4YY=
+github.com/mmcloughlin/avo v0.6.0/go.mod h1:8CoAGaCSYXtCPR+8y18Y9aB/kxb8JSS6FRI7mSkvD+8=
 github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
 github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
 github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc=
@@ -682,8 +680,8 @@ github.com/moby/sys/user v0.3.0/go.mod h1:bG+tYYYJgaMtRKgEmuueC0hJEAZWwtIbZTB+85
 github.com/moby/sys/userns v0.1.0 h1:tVLXkFOxVu9A64/yh59slHVv9ahO9UIev4JZusOLG/g=
 github.com/moby/sys/userns v0.1.0/go.mod h1:IHUYgu/kao6N8YZlp9Cf444ySSvCmDlmzUcYfDHOl28=
 github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod h1:DdlQx2hp0Ss5/fLikoLlEeIYiATotOjgB//nb973jeo=
-github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0=
-github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y=
+github.com/moby/term v0.5.2 h1:6qk3FJAFDs6i/q3W/pQ97SX192qKfZgGjCQqfCJkgzQ=
+github.com/moby/term v0.5.2/go.mod h1:d3djjFCrjnB+fl8NJux+EJzu0msscUP+f8it8hPkFLc=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
@@ -692,6 +690,12 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY
 github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
 github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
 github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ=
+github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI=
+github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo=
+github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=
+github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo=
+github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s=
+github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8=
 github.com/muesli/termenv v0.15.2 h1:GohcuySI0QmI3wN8Ok9PtKGkgkFIk7y6Vpb5PvrY+Wo=
 github.com/muesli/termenv v0.15.2/go.mod h1:Epx+iuz8sNs7mNKhxzH4fWXGNpZwUaJKRS1noLXviQ8=
 github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
@@ -761,8 +765,8 @@ github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrap
 github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
 github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
-github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4=
-github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI=
+github.com/pjbgf/sha1cd v0.3.1 h1:Dh2GYdpJnO84lIw0LJwTFXjcNbasP/bklicSznyAaPI=
+github.com/pjbgf/sha1cd v0.3.1/go.mod h1:Y8t7jSB/dEI/lQE04A1HVKteqjj9bX5O4+Cex0TCu8s=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -793,8 +797,6 @@ github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8
 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc=
 github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
-github.com/prometheus/common v0.60.1 h1:FUas6GcOw66yB/73KC+BOZoFJmbo/1pojoILArPAaSc=
-github.com/prometheus/common v0.60.1/go.mod h1:h0LYf1R1deLSKtD4Vdg8gy4RuOvENW2J/h19V5NADQw=
 github.com/prometheus/common v0.61.0 h1:3gv/GThfX0cV2lpO7gkTUwZru38mxevy90Bj8YFSRQQ=
 github.com/prometheus/common v0.61.0/go.mod h1:zr29OCN/2BsJRaFwG8QOBr41D6kkchKbpeNH7pAjb/s=
 github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
@@ -811,6 +813,7 @@ github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1
 github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
 github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
+github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
 github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
@@ -819,7 +822,6 @@ github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
 github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
-github.com/russross/blackfriday v1.6.0 h1:KqfZb0pUVN2lYqZUYRddxF4OR8ZMURnJIG5Y3VRLtww=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
@@ -905,8 +907,6 @@ github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijb
 github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 github.com/urfave/cli v1.22.4/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
-github.com/urfave/cli/v3 v3.0.0-alpha9.1.0.20241019193437-5053ec708a44 h1:BeSTAZEDkDVNv9EOrycIGCkEg+6EhRRgSsbdc93Q3OM=
-github.com/urfave/cli/v3 v3.0.0-alpha9.1.0.20241019193437-5053ec708a44/go.mod h1:FnIeEMYu+ko8zP1F9Ypr3xkZMIDqW3DR92yUtY39q1Y=
 github.com/vbatts/tar-split v0.11.2/go.mod h1:vV3ZuO2yWSVsz+pfFzDG/upWH1JhjOiEaWq6kXyQ3VI=
 github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk=
 github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE=
@@ -947,49 +947,29 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
 go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0 h1:DheMAlT6POBP+gh8RUH19EOTnQIor5QE0uSRPtzCpSw=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0/go.mod h1:wZcGmeVO9nzP67aYSLDqXNWK87EZWhi7JWj1v7ZXf94=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 h1:yd02MEjBdJkG3uabWP9apV+OuWRIXGDuJEUJbOHmCFU=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0/go.mod h1:umTcuxiv1n/s/S6/c2AT/g2CQ7u5C59sHDNmfSwgz7Q=
-go.opentelemetry.io/otel v1.32.0 h1:WnBN+Xjcteh0zdk01SVqV55d/m62NJLJdIyb4y/WO5U=
-go.opentelemetry.io/otel v1.32.0/go.mod h1:00DCVSB0RQcnzlwyTfqtxSm+DRr9hpYrHjNGiBHVQIg=
 go.opentelemetry.io/otel v1.33.0 h1:/FerN9bax5LoK51X/sI0SVYrjSE0/yUL7DpxW4K3FWw=
 go.opentelemetry.io/otel v1.33.0/go.mod h1:SUUkR6csvUQl+yjReHu5uM3EtVV7MBm5FHKRlNx4I8I=
-go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.32.0 h1:j7ZSD+5yn+lo3sGV69nW04rRR0jhYnBwjuX3r0HvnK0=
-go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.32.0/go.mod h1:WXbYJTUaZXAbYd8lbgGuvih0yuCfOFC5RJoYnoLcGz8=
 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.33.0 h1:7F29RDmnlqk6B5d+sUqemt8TBfDqxryYW5gX6L74RFA=
 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.33.0/go.mod h1:ZiGDq7xwDMKmWDrN1XsXAj0iC7hns+2DhxBFSncNHSE=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0 h1:IJFEoHiytixx8cMiVAO+GmHR6Frwu+u5Ur8njpFO6Ac=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0/go.mod h1:3rHrKNtLIoS0oZwkY2vxi+oJcwFRWdtUyRII+so45p8=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 h1:Vh5HayB/0HHfOQA7Ctx69E/Y/DcQSMPpKANYVMQ7fBA=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0/go.mod h1:cpgtDBaqD/6ok/UG0jT15/uKjAY8mRA53diogHBg3UI=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.32.0 h1:9kV11HXBHZAvuPUZxmMWrH8hZn/6UnHX4K0mu36vNsU=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.32.0/go.mod h1:JyA0FHXe22E1NeNiHmVp7kFHglnexDQ7uRWDiiJ1hKQ=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 h1:5pojmb1U1AogINhN3SurB+zm/nIcusopeBNp42f45QM=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0/go.mod h1:57gTHJSE5S1tqg+EKsLPlTWhpHMsWlVmer+LA926XiA=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 h1:IeMeyr1aBvBiPVYihXIaeIZba6b8E1bYp7lbdxK8CQg=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0/go.mod h1:oVdCUtjq9MK9BlS7TtucsQwUcXcymNiEDjgDD2jMtZU=
-go.opentelemetry.io/otel/metric v1.32.0 h1:xV2umtmNcThh2/a/aCP+h64Xx5wsj8qqnkYZktzNa0M=
-go.opentelemetry.io/otel/metric v1.32.0/go.mod h1:jH7CIbbK6SH2V2wE16W05BHCtIDzauciCRLoc/SyMv8=
 go.opentelemetry.io/otel/metric v1.33.0 h1:r+JOocAyeRVXD8lZpjdQjzMadVZp2M4WmQ+5WtEnklQ=
 go.opentelemetry.io/otel/metric v1.33.0/go.mod h1:L9+Fyctbp6HFTddIxClbQkjtubW6O9QS3Ann/M82u6M=
-go.opentelemetry.io/otel/sdk v1.32.0 h1:RNxepc9vK59A8XsgZQouW8ue8Gkb4jpWtJm9ge5lEG4=
-go.opentelemetry.io/otel/sdk v1.32.0/go.mod h1:LqgegDBjKMmb2GC6/PrTnteJG39I8/vJCAP9LlJXEjU=
 go.opentelemetry.io/otel/sdk v1.33.0 h1:iax7M131HuAm9QkZotNHEfstof92xM+N8sr3uHXc2IM=
 go.opentelemetry.io/otel/sdk v1.33.0/go.mod h1:A1Q5oi7/9XaMlIWzPSxLRWOI8nG3FnzHJNbiENQuihM=
-go.opentelemetry.io/otel/sdk/metric v1.32.0 h1:rZvFnvmvawYb0alrYkjraqJq0Z4ZUJAiyYCU9snn1CU=
-go.opentelemetry.io/otel/sdk/metric v1.32.0/go.mod h1:PWeZlq0zt9YkYAp3gjKZ0eicRYvOh1Gd+X99x6GHpCQ=
 go.opentelemetry.io/otel/sdk/metric v1.33.0 h1:Gs5VK9/WUJhNXZgn8MR6ITatvAmKeIuCtNbsP3JkNqU=
 go.opentelemetry.io/otel/sdk/metric v1.33.0/go.mod h1:dL5ykHZmm1B1nVRk9dDjChwDmt81MjVp3gLkQRwKf/Q=
-go.opentelemetry.io/otel/trace v1.32.0 h1:WIC9mYrXf8TmY/EXuULKc8hR17vE+Hjv2cssQDe03fM=
-go.opentelemetry.io/otel/trace v1.32.0/go.mod h1:+i4rkvCraA+tG6AzwloGaCtkx53Fa+L+V8e9a7YvhT8=
 go.opentelemetry.io/otel/trace v1.33.0 h1:cCJuF7LRjUFso9LPnEAHJDB2pqzp+hbO8eu1qqW2d/s=
 go.opentelemetry.io/otel/trace v1.33.0/go.mod h1:uIcdVUZMpTAmz0tI1z04GoVSezK37CbGV4fr1f2nBck=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
-go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0=
-go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8=
-go.opentelemetry.io/proto/otlp v1.4.0 h1:TA9WRvW6zMwP+Ssb6fLoUIuirti1gGbP28GcKG1jgeg=
-go.opentelemetry.io/proto/otlp v1.4.0/go.mod h1:PPBWZIP98o2ElSqI35IHfu7hIhSwvc5N38Jw8pXuGFY=
+go.opentelemetry.io/proto/otlp v1.5.0 h1:xJvq7gMzB31/d406fB8U5CBdyQGw4P399D1aQWU/3i4=
+go.opentelemetry.io/proto/otlp v1.5.0/go.mod h1:keN8WnHxOy8PG0rQZjJJ5A2ebUoafqWp0eVQ4yIXvJ4=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
@@ -1014,10 +994,8 @@ golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9/go.mod h1:jdWPYTVW3xRLrWP
 golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.29.0 h1:L5SG1JTTXupVV3n6sUqMTeWbjAyfPwoda2DLX8J8FrQ=
-golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg=
-golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
-golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
+golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
+golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -1028,10 +1006,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f h1:XdNn9LlyWAhLVp6P/i8QYBW+hlyhrhei9uErw2B5GJo=
-golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f/go.mod h1:D5SMRVC3C2/4+F/DB1wZsLRnSNimn2Sp/NPsCrsv8ak=
-golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 h1:1UoZQm6f0P/ZO0w1Ri+f+ifG/gXhegadRdwBIXEFWDo=
-golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c=
+golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 h1:yqrTHse8TCMW1M1ZCP+VAR/l0kKxwaAIqN/il7x4voA=
+golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8/go.mod h1:tujkw807nyEEAamNbDrEGzRav+ilXA7PCRAd6xsmwiU=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -1054,6 +1030,8 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
+golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -1095,10 +1073,8 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b
 golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo=
-golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM=
-golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
-golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
+golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
+golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -1116,8 +1092,6 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ=
-golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
 golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -1189,6 +1163,7 @@ golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -1199,17 +1174,13 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=
-golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.26.0 h1:WEQa6V3Gja/BhNxg540hBip/kkaYtRg3cxg4oXSw4AU=
-golang.org/x/term v0.26.0/go.mod h1:Si5m1o57C5nBNQo5z1iq+XDijt21BDBDp2bK0QI8e3E=
-golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
-golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
+golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
+golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -1219,8 +1190,6 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug=
-golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4=
 golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
 golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -1229,8 +1198,8 @@ golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxb
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg=
-golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
+golang.org/x/time v0.9.0 h1:EsRrnYcQiGH+5FfbgvV4AP7qEZstoyrHB0DzarOQ4ZY=
+golang.org/x/time v0.9.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -1276,6 +1245,8 @@ golang.org/x/tools v0.0.0-20200916195026-c9a70fc28ce3/go.mod h1:z6u4i615ZeAfBE4X
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.29.0 h1:Xx0h3TtM9rzQpQuR4dKLrdglAmCEN5Oi+P74JdhdzXE=
+golang.org/x/tools v0.29.0/go.mod h1:KMQVMRsVxU6nHCFXrBPhDB8XncLNLM0lIy/F14RP588=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -1324,14 +1295,10 @@ google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfG
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
 google.golang.org/genproto v0.0.0-20200527145253-8367513e4ece/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
 google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto/googleapis/api v0.0.0-20241118233622-e639e219e697 h1:pgr/4QbFyktUv9CtQ/Fq4gzEE6/Xs7iCXbktaGzLHbQ=
-google.golang.org/genproto/googleapis/api v0.0.0-20241118233622-e639e219e697/go.mod h1:+D9ySVjN8nY8YCVjc5O7PZDIdZporIDY3KaGfJunh88=
-google.golang.org/genproto/googleapis/api v0.0.0-20241223144023-3abc09e42ca8 h1:st3LcW/BPi75W4q1jJTEor/QWwbNlPlDG0JTn6XhZu0=
-google.golang.org/genproto/googleapis/api v0.0.0-20241223144023-3abc09e42ca8/go.mod h1:klhJGKFyG8Tn50enBn7gizg4nXGXJ+jqEREdCWaPcV4=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697 h1:LWZqQOEjDyONlF1H6afSWpAL/znlREo2tHfLoe+8LMA=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697/go.mod h1:5uTbfoYQed2U9p3KIj2/Zzm02PYhndfdmML0qC3q3FU=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8 h1:TqExAhdPaB60Ux47Cn0oLV07rGnxZzIsaRhQaqS666A=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8/go.mod h1:lcTa1sDdWEIHMWlITnIczmw5w60CF9ffkb8Z+DVmmjA=
+google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 h1:GVIKPyP/kLIyVOgOnTwFOrvQaQUzOzGMCxgFUOEmm24=
+google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422/go.mod h1:b6h1vNKhxaSoEI+5jc3PJUCustfli/mRab7295pY7rw=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422 h1:3UsHvIr4Wc2aW4brOaSCmcxh9ksica6fHEr8P1XhkYw=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422/go.mod h1:3ENsm/5D1mzDyhpzeRi1NR784I0BcofWBoSc5QqqMK4=
 google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.0.5/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
@@ -1351,8 +1318,6 @@ google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTp
 google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
 google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
 google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
-google.golang.org/grpc v1.68.0 h1:aHQeeJbo8zAkAa3pRzrVjZlbz6uSfeOXlJNQM0RAbz0=
-google.golang.org/grpc v1.68.0/go.mod h1:fmSPC5AsjSBCK54MyHRx48kpOti1/jRfOlwEWywNjWA=
 google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU=
 google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
@@ -1368,10 +1333,8 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
-google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
-google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk=
-google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.36.2 h1:R8FeyR1/eLmkutZOM5CWghmo5itiG9z0ktFlTVLuTmU=
+google.golang.org/protobuf v1.36.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/cenkalti/backoff.v2 v2.2.1 h1:eJ9UAg01/HIHG987TwxvnzK2MgxXq97YY6rYDpY9aII=
@@ -1411,7 +1374,6 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
 gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
 gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
 gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8=

pkg/app/app.go

@@ -36,7 +36,7 @@ func Get(appName string) (App, error) {
 		return App{}, err
 	}
 
-	log.Debugf("retrieved %s for %s", app, appName)
+	log.Debugf("loaded app %s: %s", appName, app)
 
 	return app, nil
 }
@@ -91,6 +91,17 @@ type App struct {
 	Path   string
 }
 
+// String outputs a human-friendly string representation.
+func (a App) String() string {
+	out := fmt.Sprintf("{name: %s, ", a.Name)
+	out += fmt.Sprintf("recipe: %s, ", a.Recipe)
+	out += fmt.Sprintf("domain: %s, ", a.Domain)
+	out += fmt.Sprintf("env %s, ", a.Env)
+	out += fmt.Sprintf("server %s, ", a.Server)
+	out += fmt.Sprintf("path %s}", a.Path)
+	return out
+}
+
 // Type aliases to make code hints easier to understand
 
 // AppName is AppName
@@ -235,8 +246,6 @@ func ReadAppEnvFile(appFile AppFile, name AppName) (App, error) {
 		return App{}, fmt.Errorf("env file for %s couldn't be read: %s", name, err.Error())
 	}
 
-	log.Debugf("read env %s from %s", env, appFile.Path)
-
 	app, err := NewApp(env, name, appFile)
 	if err != nil {
 		return App{}, fmt.Errorf("env file for %s has issues: %s", name, err.Error())
@@ -494,13 +503,13 @@ func GetAppComposeConfig(recipe string, opts stack.Deploy, appEnv envfile.AppEnv
 func ExposeAllEnv(stackName string, compose *composetypes.Config, appEnv envfile.AppEnv) {
 	for _, service := range compose.Services {
 		if service.Name == "app" {
-			log.Debugf("add the following environment to the app service config of %s:", stackName)
+			log.Debugf("adding env vars to %s service config", stackName)
 			for k, v := range appEnv {
 				_, exists := service.Environment[k]
 				if !exists {
 					value := v
 					service.Environment[k] = &value
-					log.Debugf("add env var: %s value: %s to %s", k, value, stackName)
+					log.Debugf("%s: %s: %s", stackName, k, value)
 				}
 			}
 		}
@@ -569,16 +578,19 @@ func ReadAbraShCmdNames(abraSh string) ([]string, error) {
 	return cmdNames, nil
 }
 
-func (a App) WriteRecipeVersion(version string, dryRun bool) error {
+// Wipe removes the version from the app .env file.
+func (a App) WipeRecipeVersion() error {
 	file, err := os.Open(a.Path)
 	if err != nil {
 		return err
 	}
 	defer file.Close()
 
-	skipped := false
-	scanner := bufio.NewScanner(file)
-	lines := []string{}
+	var (
+		lines   []string
+		scanner = bufio.NewScanner(file)
+	)
+
 	for scanner.Scan() {
 		line := scanner.Text()
 		if !strings.HasPrefix(line, "RECIPE=") && !strings.HasPrefix(line, "TYPE=") {
@@ -591,13 +603,71 @@ func (a App) WriteRecipeVersion(version string, dryRun bool) error {
 			continue
 		}
 
-		if strings.Contains(line, version) {
+		splitted := strings.Split(line, ":")
+		lines = append(lines, splitted[0])
+	}
+
+	if err := scanner.Err(); err != nil {
+		log.Fatal(err)
+	}
+
+	if err := os.WriteFile(a.Path, []byte(strings.Join(lines, "\n")), os.ModePerm); err != nil {
+		log.Fatal(err)
+	}
+
+	log.Debugf("version wiped from %s.env", a.Domain)
+
+	return nil
+}
+
+// WriteRecipeVersion writes the recipe version to the app .env file.
+func (a App) WriteRecipeVersion(version string, dryRun bool) error {
+	file, err := os.Open(a.Path)
+	if err != nil {
+		return err
+	}
+	defer file.Close()
+
+	var (
+		dirtyVersion string
+		skipped      bool
+		lines        []string
+		scanner      = bufio.NewScanner(file)
+	)
+
+	for scanner.Scan() {
+		line := scanner.Text()
+		if !strings.HasPrefix(line, "RECIPE=") && !strings.HasPrefix(line, "TYPE=") {
+			lines = append(lines, line)
+			continue
+		}
+
+		if strings.HasPrefix(line, "#") {
+			lines = append(lines, line)
+			continue
+		}
+
+		if strings.Contains(line, version) && !a.Recipe.Dirty && !strings.HasSuffix(line, config.DIRTY_DEFAULT) {
 			skipped = true
 			lines = append(lines, line)
 			continue
 		}
 
 		splitted := strings.Split(line, ":")
+
+		if a.Recipe.Dirty {
+			dirtyVersion = fmt.Sprintf("%s%s", version, config.DIRTY_DEFAULT)
+			if strings.Contains(line, dirtyVersion) {
+				skipped = true
+				lines = append(lines, line)
+				continue
+			}
+
+			line = fmt.Sprintf("%s:%s", splitted[0], dirtyVersion)
+			lines = append(lines, line)
+			continue
+		}
+
 		line = fmt.Sprintf("%s:%s", splitted[0], version)
 		lines = append(lines, line)
 	}
@@ -606,6 +676,10 @@ func (a App) WriteRecipeVersion(version string, dryRun bool) error {
 		log.Fatal(err)
 	}
 
+	if a.Recipe.Dirty && dirtyVersion != "" {
+		version = dirtyVersion
+	}
+
 	if !dryRun {
 		if err := os.WriteFile(a.Path, []byte(strings.Join(lines, "\n")), os.ModePerm); err != nil {
 			log.Fatal(err)

pkg/app/app_test.go

@@ -198,3 +198,41 @@ func compareFilter(t *testing.T, f1 filters.Args, f2 map[string]map[string]bool)
 		t.Errorf("filters mismatch (-want +got):\n%s", diff)
 	}
 }
+
+func TestWriteRecipeVersionOverwrite(t *testing.T) {
+	app, err := appPkg.GetApp(testPkg.ExpectedAppFiles, testPkg.AppName)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	defer t.Cleanup(func() {
+		if err := app.WipeRecipeVersion(); err != nil {
+			t.Fatal(err)
+		}
+	})
+
+	assert.Equal(t, "", app.Recipe.EnvVersion)
+
+	if err := app.WriteRecipeVersion("foo", false); err != nil {
+		t.Fatal(err)
+	}
+
+	app, err = appPkg.GetApp(testPkg.ExpectedAppFiles, testPkg.AppName)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	assert.Equal(t, "foo", app.Recipe.EnvVersion)
+
+	app.Recipe.Dirty = true
+	if err := app.WriteRecipeVersion("foo+U", false); err != nil {
+		t.Fatal(err)
+	}
+
+	app, err = appPkg.GetApp(testPkg.ExpectedAppFiles, testPkg.AppName)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	assert.Equal(t, "foo+U", app.Recipe.EnvVersion)
+}

pkg/autocomplete/autocomplete.go

@@ -54,7 +54,7 @@ func RecipeNameComplete() ([]string, cobra.ShellCompDirective) {
 
 // RecipeVersionComplete completes versions for the recipe.
 func RecipeVersionComplete(recipeName string) ([]string, cobra.ShellCompDirective) {
-	catl, err := recipe.ReadRecipeCatalogue(false)
+	catl, err := recipe.ReadRecipeCatalogue(true)
 	if err != nil {
 		err := fmt.Sprintf("autocomplete failed: %s", err)
 		return []string{err}, cobra.ShellCompDirectiveError

pkg/catalogue/catalogue.go

@@ -16,13 +16,12 @@ import (
 func EnsureCatalogue() error {
 	catalogueDir := path.Join(config.ABRA_DIR, "catalogue")
 	if _, err := os.Stat(catalogueDir); err != nil && os.IsNotExist(err) {
-		log.Warnf("local recipe catalogue is missing, retrieving now")
+		log.Debugf("catalogue is missing, retrieving now")
+
 		url := fmt.Sprintf("%s/%s.git", config.REPOS_BASE_URL, config.CATALOGUE_JSON_REPO_NAME)
 		if err := gitPkg.Clone(catalogueDir, url); err != nil {
 			return err
 		}
-
-		log.Debugf("cloned catalogue repository to %s", catalogueDir)
 	}
 
 	return nil

pkg/config/abra.go

@@ -90,6 +90,7 @@ func (a Abra) GetAbraDir() string {
 
 func (a Abra) GetServersDir() string   { return path.Join(a.GetAbraDir(), "servers") }
 func (a Abra) GetRecipesDir() string   { return path.Join(a.GetAbraDir(), "recipes") }
+func (a Abra) GetLogsDir() string      { return path.Join(a.GetAbraDir(), "logs") }
 func (a Abra) GetVendorDir() string    { return path.Join(a.GetAbraDir(), "vendor") }
 func (a Abra) GetBackupDir() string    { return path.Join(a.GetAbraDir(), "backups") }
 func (a Abra) GetCatalogueDir() string { return path.Join(a.GetAbraDir(), "catalogue") }
@@ -100,13 +101,15 @@ var (
 	ABRA_DIR                  = config.GetAbraDir()
 	SERVERS_DIR               = config.GetServersDir()
 	RECIPES_DIR               = config.GetRecipesDir()
+	LOGS_DIR                  = config.GetLogsDir()
 	VENDOR_DIR                = config.GetVendorDir()
 	BACKUP_DIR                = config.GetBackupDir()
 	CATALOGUE_DIR             = config.GetCatalogueDir()
 	RECIPES_JSON              = path.Join(config.GetCatalogueDir(), "recipes.json")
 	REPOS_BASE_URL            = "https://git.coopcloud.tech/coop-cloud"
 	CATALOGUE_JSON_REPO_NAME  = "recipes-catalogue-json"
-	SSH_URL_TEMPLATE         = "ssh://git@git.coopcloud.tech:2222/coop-cloud/%s.git"
+	TOOLSHED_SSH_URL_TEMPLATE = "ssh://git@git.coopcloud.tech:2222/toolshed/%s.git"
+	RECIPES_SSH_URL_TEMPLATE  = "ssh://git@git.coopcloud.tech:2222/coop-cloud/%s.git"
 
 	// NOTE(d1): please note, this was done purely out of laziness on our part
 	// AFAICR. it's easy to punt the value into the label because that is what is
@@ -114,6 +117,10 @@ var (
 	// complained yet!
 	CHAOS_DEFAULT = "false"
 
+	DIRTY_DEFAULT = "+U"
+
 	NO_DOMAIN_DEFAULT  = "N/A"
 	NO_VERSION_DEFAULT = "N/A"
+
+	UNKNOWN_DEFAULT = "unknown"
 )

pkg/config/env.go

@@ -26,9 +26,16 @@ func GetServers() ([]string, error) {
 		return servers, err
 	}
 
-	log.Debugf("retrieved %v servers: %s", len(servers), servers)
+	var filtered []string
+	for _, s := range servers {
+		if !strings.HasPrefix(s, ".") {
+			filtered = append(filtered, s)
+		}
+	}
 
-	return servers, nil
+	log.Debugf("retrieved %v servers: %s", len(filtered), filtered)
+
+	return filtered, nil
 }
 
 // ReadServerNames retrieves all server names.
@@ -63,7 +70,7 @@ func GetAllFilesInDirectory(directory string) ([]fs.FileInfo, error) {
 
 		realPath, err := filepath.EvalSymlinks(filePath)
 		if err != nil {
-			log.Warnf("broken symlink in your $ABRA_DIR: %s", filePath)
+			log.Warnf("broken symlink in your abra config folders: %s", filePath)
 		} else {
 			realFile, err := os.Stat(realPath)
 			if err != nil {

pkg/dns/dns_test.go

@@ -15,7 +15,7 @@ func TestEnsureDomainsResolveSameIPv4(t *testing.T) {
 	}{
 		// NOTE(d1): DNS records get checked, so use something that is maintained
 		// within the federation. if you're here because of a failing test, try
-		// `dig +short <app>` to ensure stuff matches first! If flakyness
+		// `dig +short <domain>` to ensure stuff matches first! If flakyness
 		// becomes an issue we can look into mocking
 		{"docs.coopcloud.tech", "swarm-0.coopcloud.tech", true},
 		{"docs.coopcloud.tech", "coopcloud.tech", true},
@@ -43,7 +43,7 @@ func TestEnsureDomainsResolveSameIPv4(t *testing.T) {
 func TestEnsureIpv4(t *testing.T) {
 	// NOTE(d1): DNS records get checked, so use something that is maintained
 	// within the federation. if you're here because of a failing test, try `dig
-	// +short <app>` to ensure stuff matches first! If flakyness becomes an
+	// +short <domain>` to ensure stuff matches first! If flakyness becomes an
 	// issue we can look into mocking
 	domainName := "collabora.ostrom.collective.tools"
 	serverName := "ostrom.collective.tools"

pkg/envfile/envfile.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 
 	"coopcloud.tech/abra/pkg/log"
-	"git.coopcloud.tech/coop-cloud/godotenv"
+	"git.coopcloud.tech/toolshed/godotenv"
 )
 
 // envVarModifiers is a list of env var modifier strings. These are added to
@@ -31,8 +31,6 @@ func ReadEnv(filePath string) (AppEnv, error) {
 		return nil, err
 	}
 
-	log.Debugf("read %s from %s", envVars, filePath)
-
 	return envVars, nil
 }
 

pkg/envfile/envfile_test.go

@@ -192,7 +192,7 @@ func TestEnvVarCommentsRemoved(t *testing.T) {
 
 	envVar, exists = envSample["SECRET_TEST_PASS_TWO_VERSION"]
 	if !exists {
-		t.Fatal("WITH_COMMENT env var should be present in .env.sample")
+		t.Fatal("SECRET_TEST_PASS_TWO_VERSION env var should be present in .env.sample")
 	}
 
 	if strings.Contains(envVar, "length") {

pkg/formatter/formatter.go

@@ -13,11 +13,15 @@ import (
 	"github.com/docker/go-units"
 	"golang.org/x/term"
 
+	"coopcloud.tech/abra/pkg/config"
 	"coopcloud.tech/abra/pkg/log"
 	"github.com/schollz/progressbar/v3"
 )
 
 var BoldStyle = lipgloss.NewStyle().
+	Bold(true)
+
+var BoldUnderlineStyle = lipgloss.NewStyle().
 	Bold(true).
 	Underline(true)
 
@@ -102,7 +106,6 @@ func CreateOverview(header string, rows [][]string) string {
 	var borderStyle = lipgloss.NewStyle().
 		BorderStyle(lipgloss.ThickBorder()).
 		Padding(0, 1, 0, 1).
-		MaxWidth(79).
 		BorderForeground(lipgloss.Color("63"))
 
 	var headerStyle = lipgloss.NewStyle().
@@ -110,9 +113,7 @@ func CreateOverview(header string, rows [][]string) string {
 		Bold(true).
 		PaddingBottom(1)
 
-	var leftStyle = lipgloss.NewStyle().
-		Bold(true)
-
+	var leftStyle = lipgloss.NewStyle()
 	var rightStyle = lipgloss.NewStyle()
 
 	var longest int
@@ -124,6 +125,10 @@ func CreateOverview(header string, rows [][]string) string {
 
 	var renderedRows []string
 	for _, row := range rows {
+		if len(row) < 2 {
+			continue
+		}
+
 		if len(row) > 2 {
 			panic("CreateOverview: only accepts rows of len == 2")
 		}
@@ -138,12 +143,23 @@ func CreateOverview(header string, rows [][]string) string {
 			offset = offset + " "
 		}
 
-		renderedRows = append(
-			renderedRows,
-			horizontal(leftStyle.Render(row[0]), offset, rightStyle.Render(row[1])),
+		rendered := horizontal(leftStyle.Render(row[0]), offset, rightStyle.Render(row[1]))
+
+		if row[1] == "---" {
+			rendered = horizontal(
+				leftStyle.
+					Bold(true).
+					Underline(true).
+					PaddingTop(1).
+					Render(row[0]),
+				offset,
+				rightStyle.Render(""),
 			)
 		}
 
+		renderedRows = append(renderedRows, rendered)
+	}
+
 	body := strings.Builder{}
 	body.WriteString(
 		borderStyle.Render(
@@ -201,7 +217,6 @@ func CreateProgressbar(length int, title string) *progressbar.ProgressBar {
 		progressbar.OptionClearOnFinish(),
 		progressbar.OptionSetPredictTime(false),
 		progressbar.OptionShowCount(),
-		progressbar.OptionFullWidth(),
 		progressbar.OptionSetDescription(title),
 	)
 }
@@ -242,3 +257,18 @@ func ByteCountSI(b uint64) string {
 
 	return fmt.Sprintf("%.1f %cB", float64(b)/float64(div), "kMGTPE"[exp])
 }
+
+// BoldDirtyDefault ensures a dirty modifier is rendered in bold.
+func BoldDirtyDefault(v string) string {
+	if strings.HasSuffix(v, config.DIRTY_DEFAULT) {
+		vBold := BoldStyle.Render(config.DIRTY_DEFAULT)
+		v = strings.Replace(v, config.DIRTY_DEFAULT, vBold, 1)
+	}
+
+	return v
+}
+
+// AddDirtyMarker adds the dirty marker to a version string.
+func AddDirtyMarker(v string) string {
+	return fmt.Sprintf("%s%s", v, config.DIRTY_DEFAULT)
+}

pkg/formatter/formatter_test.go

@@ -0,0 +1,11 @@
+package formatter
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestBoldDirtyDefault(t *testing.T) {
+	assert.Equal(t, "foo", BoldDirtyDefault("foo"))
+}

pkg/git/clone.go

@@ -1,9 +1,7 @@
 package git
 
 import (
-	"fmt"
 	"os"
-	"path/filepath"
 	"strings"
 
 	"coopcloud.tech/abra/pkg/log"
@@ -11,19 +9,23 @@ import (
 	"github.com/go-git/go-git/v5/plumbing"
 )
 
+// gitCloneIgnoreErr checks whether we can ignore a git clone error or not.
+func gitCloneIgnoreErr(err error) bool {
+	if strings.Contains(err.Error(), "authentication required") {
+		return true
+	}
+
+	if strings.Contains(err.Error(), "remote repository is empty") {
+		return true
+	}
+
+	return false
+}
+
 // Clone runs a git clone which accounts for different default branches.
 func Clone(dir, url string) error {
 	if _, err := os.Stat(dir); os.IsNotExist(err) {
-		log.Debugf("%s does not exist, attempting to git clone from %s", dir, url)
-
-		_, err := git.PlainClone(dir, false, &git.CloneOptions{
-			URL:           url,
-			Tags:          git.AllTags,
-			ReferenceName: plumbing.ReferenceName("refs/heads/master"),
-			SingleBranch:  true,
-		})
-		if err != nil {
-			log.Debugf("cloning %s default branch failed, attempting from main branch", url)
+		log.Debugf("git clone: %s", dir, url)
 
 		_, err := git.PlainClone(dir, false, &git.CloneOptions{
 			URL:           url,
@@ -31,19 +33,35 @@ func Clone(dir, url string) error {
 			ReferenceName: plumbing.ReferenceName("refs/heads/main"),
 			SingleBranch:  true,
 		})
-			if err != nil {
-				if strings.Contains(err.Error(), "authentication required") {
-					name := filepath.Base(dir)
-					return fmt.Errorf("unable to clone %s, does %s exist?", name, url)
+
+		if err != nil && gitCloneIgnoreErr(err) {
+			log.Debugf("git clone: %s cloned successfully", dir)
+			return nil
 		}
 
+		if err != nil {
+			log.Debug("git clone: main branch failed, attempting master branch")
+
+			_, err := git.PlainClone(dir, false, &git.CloneOptions{
+				URL:           url,
+				Tags:          git.AllTags,
+				ReferenceName: plumbing.ReferenceName("refs/heads/master"),
+				SingleBranch:  true,
+			})
+
+			if err != nil && gitCloneIgnoreErr(err) {
+				log.Debugf("git clone: %s cloned successfully", dir)
+				return nil
+			}
+
+			if err != nil {
 				return err
 			}
 		}
 
-		log.Debugf("%s has been git cloned successfully", dir)
+		log.Debugf("git clone: %s cloned successfully", dir)
 	} else {
-		log.Debugf("%s already exists", dir)
+		log.Debugf("git clone: %s already exists", dir)
 	}
 
 	return nil

pkg/git/commit.go

@@ -45,39 +45,3 @@ func Commit(repoPath, commitMessage string, dryRun bool) error {
 
 	return nil
 }
-
-// CommitFile commits a specific file.
-func CommitFile(repoPath, filePath, commitMessage string, dryRun bool) error {
-	if commitMessage == "" {
-		return fmt.Errorf("no commit message specified?")
-	}
-
-	commitRepo, err := git.PlainOpen(repoPath)
-	if err != nil {
-		return err
-	}
-
-	commitWorktree, err := commitRepo.Worktree()
-	if err != nil {
-		return err
-	}
-
-	if !dryRun {
-		if _, err := commitWorktree.Add(filePath); err != nil {
-			return fmt.Errorf("unable to add %s: %s", filePath, err)
-		}
-	}
-
-	opts := &git.CommitOptions{}
-	if !dryRun {
-		_, err = commitWorktree.Commit(commitMessage, opts)
-		if err != nil {
-			return err
-		}
-		log.Debug("git changes commited")
-	} else {
-		log.Debug("dry run: no changes commited")
-	}
-
-	return nil
-}

pkg/git/diff.go

@@ -3,7 +3,6 @@ package git
 import (
 	"fmt"
 	"os/exec"
-	"strings"
 
 	"coopcloud.tech/abra/pkg/log"
 )
@@ -11,8 +10,8 @@ import (
 // getGitDiffArgs builds the `git diff` invocation args. It removes the usage
 // of a pager and ensures that colours are specified even when Git might detect
 // otherwise.
-func getGitDiffArgs(repoPath, fname string) []string {
-	args := []string{
+func getGitDiffArgs(repoPath string) []string {
+	return []string{
 		"-C",
 		repoPath,
 		"--no-pager",
@@ -20,29 +19,24 @@ func getGitDiffArgs(repoPath, fname string) []string {
 		"color.diff=always",
 		"diff",
 	}
-
-	if fname != "" {
-		args = append(args, fname)
-	}
-
-	return args
 }
 
 // DiffUnstaged shows a `git diff`. Due to limitations in the underlying go-git
-// library, this implementation requires the /usr/bin/git binary.
-func DiffUnstaged(path, fname string) (string, error) {
+// library, this implementation requires the /usr/bin/git binary. It gracefully
+// skips if it cannot find the command on the system.
+func DiffUnstaged(path string) error {
 	if _, err := exec.LookPath("git"); err != nil {
-		return "", fmt.Errorf("missing /usr/bin/git command? cannot output diff")
+		log.Warnf("unable to locate git command, cannot output diff")
+		return nil
 	}
 
-	gitDiffArgs := getGitDiffArgs(path, fname)
-
-	log.Debugf("running: git %s", strings.Join(gitDiffArgs, " "))
-
+	gitDiffArgs := getGitDiffArgs(path)
 	diff, err := exec.Command("git", gitDiffArgs...).Output()
 	if err != nil {
-		return "", err
+		return nil
 	}
 
-	return string(diff), nil
+	fmt.Print(string(diff))
+
+	return nil
 }

pkg/git/dir.go

@@ -1,35 +0,0 @@
-package git
-
-import (
-	"os"
-	"path"
-	"path/filepath"
-
-	"coopcloud.tech/abra/pkg/log"
-)
-
-func FindDir(dir string) string {
-	dir, err := filepath.Abs(dir)
-	if err != nil {
-		return ""
-	}
-
-	realPath, err := filepath.EvalSymlinks(dir)
-	if err != nil {
-		log.Warn("unable to find git repo: broken symlink: %s", dir)
-		return ""
-	}
-
-	dir = realPath
-
-	if dir == os.ExpandEnv("$HOME/.abra") || dir == os.ExpandEnv("$ABRA_DIR") || dir == "/" {
-		return ""
-	}
-
-	p := path.Join(dir, ".git")
-	if _, err := os.Stat(p); err == nil {
-		return path.Dir(p)
-	}
-
-	return FindDir(filepath.Dir(dir))
-}

pkg/git/init.go

@@ -15,9 +15,11 @@ func Init(repoPath string, commit bool, gitName, gitEmail string) error {
 	if err != nil {
 		return fmt.Errorf("git init: %s", err)
 	}
+
 	if err = SwitchToMain(repo); err != nil {
 		return fmt.Errorf("git branch rename: %s", err)
 	}
+
 	log.Debugf("initialised new git repo in %s", repoPath)
 
 	if commit {
@@ -39,9 +41,11 @@ func Init(repoPath string, commit bool, gitName, gitEmail string) error {
 		if gitName != "" && gitEmail != "" {
 			author = &object.Signature{Name: gitName, Email: gitEmail}
 		}
+
 		if _, err = commitWorktree.Commit("init", &git.CommitOptions{Author: author}); err != nil {
 			return fmt.Errorf("git commit: %s", err)
 		}
+
 		log.Debugf("init committed all files for new git repo in %s", repoPath)
 	}
 
@@ -54,14 +58,18 @@ func SwitchToMain(repo *git.Repository) error {
 	if err := repo.Storer.SetReference(ref); err != nil {
 		return fmt.Errorf("set reference: %s", err)
 	}
+
 	cfg, err := repo.Config()
 	if err != nil {
 		return fmt.Errorf("repo config: %s", err)
 	}
+
 	cfg.Init.DefaultBranch = "main"
 	if err := repo.SetConfig(cfg); err != nil {
 		return fmt.Errorf("repo set config: %s", err)
 	}
-	log.Debug("set 'main' as the default branch.")
+
+	log.Debug("set 'main' as the default branch")
+
 	return nil
 }

pkg/git/pull.go

@@ -1,41 +0,0 @@
-package git
-
-import (
-	"errors"
-
-	"coopcloud.tech/abra/pkg/log"
-	"github.com/go-git/go-git/v5"
-)
-
-// Pull pulls the latest changes in.
-func Pull(repoDir string, dryRun bool) error {
-	if dryRun {
-		log.Debugf("dry run: no git changes pulled in %s", repoDir)
-		return nil
-	}
-
-	repo, err := git.PlainOpen(repoDir)
-	if err != nil {
-		return err
-	}
-
-	opts := &git.PullOptions{
-		RemoteName: "origin", // NOTE(d1): what could go wrong 🤡
-	}
-
-	worktree, err := repo.Worktree()
-	if err != nil {
-		return err
-	}
-
-	if err := worktree.Pull(opts); err != nil && !errors.Is(err, git.NoErrAlreadyUpToDate) {
-		return err
-	} else if err != nil && errors.Is(err, git.NoErrAlreadyUpToDate) {
-		log.Debugf("skipping pulling changes at %s", repoDir)
-		return nil
-	}
-
-	log.Debugf("git changes pulled in at %s", repoDir)
-
-	return nil
-}

pkg/git/push.go

@@ -27,7 +27,7 @@ func Push(repoDir string, remote string, tags bool, dryRun bool) error {
 		return err
 	}
 
-	log.Debug("git changes pushed")
+	log.Debugf("git changes pushed")
 
 	if tags {
 		opts.RefSpecs = append(opts.RefSpecs, config.RefSpec("+refs/tags/*:refs/tags/*"))
@@ -36,7 +36,7 @@ func Push(repoDir string, remote string, tags bool, dryRun bool) error {
 			return err
 		}
 
-		log.Debug("git tags pushed")
+		log.Debugf("git tags pushed")
 	}
 
 	return nil

pkg/git/read.go

@@ -1,6 +1,8 @@
 package git
 
 import (
+	"errors"
+	"fmt"
 	"io/ioutil"
 	"os"
 	"os/user"
@@ -17,12 +19,16 @@ import (
 func IsClean(repoPath string) (bool, error) {
 	repo, err := git.PlainOpen(repoPath)
 	if err != nil {
-		return false, err
+		if errors.Is(err, git.ErrRepositoryNotExists) {
+			return false, git.ErrRepositoryNotExists
+		}
+
+		return false, fmt.Errorf("unable to open %s: %s", repoPath, err)
 	}
 
 	worktree, err := repo.Worktree()
 	if err != nil {
-		return false, err
+		return false, fmt.Errorf("unable to open worktree of %s: %s", repoPath, err)
 	}
 
 	patterns, err := GetExcludesFiles()
@@ -36,13 +42,14 @@ func IsClean(repoPath string) (bool, error) {
 
 	status, err := worktree.Status()
 	if err != nil {
-		return false, err
+		return false, fmt.Errorf("unable to query status of %s: %s", repoPath, err)
 	}
 
 	if status.String() != "" {
-		log.Debugf("discovered git status in %s: %s", repoPath, status.String())
+		noNewline := strings.TrimSuffix(status.String(), "\n")
+		log.Debugf("git status: %s: %s", repoPath, noNewline)
 	} else {
-		log.Debugf("discovered clean git status in %s", repoPath)
+		log.Debugf("git status: %s: clean", repoPath)
 	}
 
 	return status.IsClean(), nil

pkg/git/read_test.go

@@ -0,0 +1,15 @@
+package git
+
+import (
+	"errors"
+	"testing"
+
+	"github.com/go-git/go-git/v5"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestIsClean(t *testing.T) {
+	isClean, err := IsClean("/tmp")
+	assert.Equal(t, isClean, false)
+	assert.True(t, errors.Is(err, git.ErrRepositoryNotExists))
+}

pkg/lint/recipe.go

@@ -409,7 +409,7 @@ func LintHasPublishedVersion(recipe recipe.Recipe) (bool, error) {
 }
 
 func LintMetadataFilledIn(r recipe.Recipe) (bool, error) {
-	features, category, err := recipe.GetRecipeFeaturesAndCategory(r)
+	features, category, _, err := recipe.GetRecipeFeaturesAndCategory(r)
 	if err != nil {
 		return false, err
 	}

pkg/log/log.go

@@ -3,9 +3,7 @@ package log
 
 import (
 	"os"
-	"strings"
 
-	"github.com/charmbracelet/lipgloss"
 	charmLog "github.com/charmbracelet/log"
 )
 
@@ -34,42 +32,3 @@ var SetLevel = Logger.SetLevel
 var DebugLevel = charmLog.DebugLevel
 var SetOutput = charmLog.SetOutput
 var SetReportCaller = charmLog.SetReportCaller
-
-func Styles() *charmLog.Styles {
-	styles := charmLog.DefaultStyles()
-
-	styles.Levels = map[charmLog.Level]lipgloss.Style{
-		charmLog.DebugLevel: lipgloss.NewStyle().
-			SetString(strings.ToUpper(DebugLevel.String())).
-			Bold(true).
-			Padding(0, 1, 0, 1).
-			Background(lipgloss.Color("63")).
-			Foreground(lipgloss.Color("15")),
-		charmLog.InfoLevel: lipgloss.NewStyle().
-			SetString(strings.ToUpper(charmLog.InfoLevel.String())).
-			Bold(true).
-			Padding(0, 1, 0, 1).
-			Background(lipgloss.Color("86")).
-			Foreground(lipgloss.Color("16")),
-		charmLog.WarnLevel: lipgloss.NewStyle().
-			SetString(strings.ToUpper(charmLog.WarnLevel.String())).
-			Bold(true).
-			Padding(0, 1, 0, 1).
-			Background(lipgloss.Color("192")).
-			Foreground(lipgloss.Color("16")),
-		charmLog.ErrorLevel: lipgloss.NewStyle().
-			SetString(strings.ToUpper(charmLog.ErrorLevel.String())).
-			Bold(true).
-			Padding(0, 1, 0, 1).
-			Background(lipgloss.Color("204")).
-			Foreground(lipgloss.Color("15")),
-		charmLog.FatalLevel: lipgloss.NewStyle().
-			SetString(strings.ToUpper(charmLog.FatalLevel.String())).
-			Bold(true).
-			Padding(0, 1, 0, 1).
-			Background(lipgloss.Color("134")).
-			Foreground(lipgloss.Color("15")),
-	}
-
-	return styles
-}

pkg/logs/logs.go

@@ -0,0 +1,133 @@
+package logs
+
+import (
+	"bytes"
+	"context"
+	"io"
+	"os"
+	"os/signal"
+	"slices"
+	"sync"
+
+	"github.com/docker/docker/api/types"
+	containerTypes "github.com/docker/docker/api/types/container"
+	"github.com/docker/docker/api/types/filters"
+	"github.com/docker/docker/api/types/swarm"
+	dockerClient "github.com/docker/docker/client"
+)
+
+type TailOpts struct {
+	AppName  string
+	Services []string
+	StdErr   bool
+	Since    string
+	Buffer   *bytes.Buffer
+	ToBuffer bool
+	Filters  filters.Args
+}
+
+// TailLogs gathers logs for the given app with optional service names to be
+// filtered on. These logs can be printed to os.Stdout or gathered to a buffer.
+func TailLogs(
+	cl *dockerClient.Client,
+	opts TailOpts,
+) error {
+	sigintChannel := make(chan os.Signal, 1)
+	signal.Notify(sigintChannel, os.Interrupt)
+	defer signal.Stop(sigintChannel)
+
+	f := filters.NewArgs()
+	for _, name := range opts.Services {
+		f.Add("name", name)
+	}
+
+	services, err := cl.ServiceList(
+		context.Background(),
+		types.ServiceListOptions{Filters: f},
+	)
+	if err != nil {
+		return err
+	}
+
+	waitCh := make(chan struct{})
+
+	go func() {
+		var wg sync.WaitGroup
+		for _, service := range services {
+			f := filters.NewArgs()
+			f.Add("name", service.Spec.Name)
+
+			tasks, err := cl.TaskList(context.Background(), types.TaskListOptions{Filters: f})
+			if err != nil {
+				// TODO
+				// return nil
+			}
+
+			if len(tasks) > 0 {
+				// Need to sort the tasks by the CreatedAt field in the inverse order.
+				// Otherwise they are in the reversed order and not sorted properly.
+				slices.SortFunc[[]swarm.Task](tasks, func(t1, t2 swarm.Task) int {
+					return int(t2.Meta.CreatedAt.Unix() - t1.Meta.CreatedAt.Unix())
+				})
+				lastTask := tasks[0].Status
+				if lastTask.State != swarm.TaskStateRunning {
+					// for _, task := range tasks {
+					// TODO
+					// return fmt.Errorf("[%s] %s state %s: %s", service.Spec.Name, task.Meta.CreatedAt.Format(time.RFC3339), task.Status.State, task.Status.Err)
+					// }
+				}
+			}
+
+			// Collect the logs in a go routine, so the logs from all services are
+			// collected in parallel.
+			wg.Add(1)
+			go func(serviceID string) {
+				logs, err := cl.ServiceLogs(context.Background(), serviceID, containerTypes.LogsOptions{
+					ShowStderr: true,
+					ShowStdout: !opts.StdErr,
+					Since:      opts.Since,
+					Until:      "",
+					Timestamps: true,
+					Follow:     true,
+					Tail:       "50",  // TODO: if buf, bump it up!
+					Details:    false, // TODO: if buf, yes!
+				})
+				if err != nil {
+					// TODO
+					// log.Debugf("unable to poll logs: %s", err)
+				}
+				defer logs.Close()
+
+				if opts.ToBuffer {
+					_, err = io.Copy(opts.Buffer, logs)
+					if err != nil && err != io.EOF {
+						// TODO
+						// log.Debugf("unable to copy buffer: %s", err)
+					}
+					logs.Close()
+					return
+				}
+
+				_, err = io.Copy(os.Stdout, logs)
+				if err != nil && err != io.EOF {
+					// TODO
+					// log.Debugf("unable to copy buffer: %s", err)
+				}
+				logs.Close()
+
+			}(service.ID)
+		}
+
+		wg.Wait()
+		close(waitCh)
+	}()
+
+	select {
+	case <-waitCh:
+		return nil
+	case <-sigintChannel:
+		return nil
+	}
+
+	return nil
+}

pkg/recipe/git.go

@@ -3,23 +3,33 @@ package recipe
 import (
 	"fmt"
 	"os"
+	"slices"
+	"sort"
 	"strings"
 
 	"coopcloud.tech/abra/pkg/formatter"
 	gitPkg "coopcloud.tech/abra/pkg/git"
 	"coopcloud.tech/abra/pkg/log"
+	"coopcloud.tech/tagcmp"
 	"github.com/distribution/reference"
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing"
 )
 
-// Ensure makes sure the recipe exists, is up to date and has the latest version checked out.
-func (r Recipe) Ensure(chaos bool, offline bool) error {
+type EnsureContext struct {
+	Chaos            bool
+	Offline          bool
+	IgnoreEnvVersion bool
+}
+
+// Ensure makes sure the recipe exists, is up to date and has the specific
+// version checked out.
+func (r Recipe) Ensure(ctx EnsureContext) error {
 	if err := r.EnsureExists(); err != nil {
 		return err
 	}
 
-	if chaos {
+	if ctx.Chaos {
 		return nil
 	}
 
@@ -27,15 +37,16 @@ func (r Recipe) Ensure(chaos bool, offline bool) error {
 		return err
 	}
 
-	if !offline {
+	if !ctx.Offline {
 		if err := r.EnsureUpToDate(); err != nil {
 			log.Fatal(err)
 		}
 	}
 
-	if r.Version != "" {
-		log.Debugf("ensuring version %s", r.Version)
-		if _, err := r.EnsureVersion(r.Version); err != nil {
+	if r.EnvVersion != "" && !ctx.IgnoreEnvVersion {
+		log.Debugf("ensuring env version %s", r.EnvVersion)
+
+		if _, err := r.EnsureVersion(r.EnvVersion); err != nil {
 			return err
 		}
 
@@ -52,7 +63,6 @@ func (r Recipe) Ensure(chaos bool, offline bool) error {
 // EnsureExists ensures that the recipe is locally cloned
 func (r Recipe) EnsureExists() error {
 	if _, err := os.Stat(r.Dir); os.IsNotExist(err) {
-		log.Debugf("%s does not exist, attemmpting to clone", r.Dir)
 		if err := gitPkg.Clone(r.Dir, r.GitURL); err != nil {
 			return err
 		}
@@ -65,6 +75,41 @@ func (r Recipe) EnsureExists() error {
 	return nil
 }
 
+// IsChaosCommit determines if a version sttring is a chaos commit or not.
+func (r Recipe) IsChaosCommit(version string) (bool, error) {
+	isChaosCommit := false
+
+	if err := gitPkg.EnsureGitRepo(r.Dir); err != nil {
+		return isChaosCommit, err
+	}
+
+	repo, err := git.PlainOpen(r.Dir)
+	if err != nil {
+		return isChaosCommit, err
+	}
+
+	tags, err := repo.Tags()
+	if err != nil {
+		return isChaosCommit, err
+	}
+
+	var tagRef plumbing.ReferenceName
+	if err := tags.ForEach(func(ref *plumbing.Reference) (err error) {
+		if ref.Name().Short() == version {
+			tagRef = ref.Name()
+		}
+		return nil
+	}); err != nil {
+		return isChaosCommit, err
+	}
+
+	if tagRef.String() == "" {
+		isChaosCommit = true
+	}
+
+	return isChaosCommit, nil
+}
+
 // EnsureVersion checks whether a specific version exists for a recipe.
 func (r Recipe) EnsureVersion(version string) (bool, error) {
 	isChaosCommit := false
@@ -137,8 +182,7 @@ func (r Recipe) EnsureIsClean() error {
 	}
 
 	if !isClean {
-		msg := "%s (%s) has locally unstaged changes? please commit/remove your changes before proceeding"
-		return fmt.Errorf(msg, r.Name, r.Dir)
+		return fmt.Errorf("%s (%s) has locally unstaged changes?", r.Name, r.Dir)
 	}
 
 	return nil
@@ -230,8 +274,23 @@ func (r Recipe) EnsureUpToDate() error {
 	return nil
 }
 
+// IsDirty checks whether a recipe is dirty or not. N.B., if you call IsDirty
+// from another Recipe method, you should propagate the pointer reference (*).
+func (r *Recipe) IsDirty() error {
+	isClean, err := gitPkg.IsClean(r.Dir)
+	if err != nil {
+		return err
+	}
+
+	if !isClean {
+		r.Dirty = true
+	}
+
+	return nil
+}
+
 // ChaosVersion constructs a chaos mode recipe version.
-func (r Recipe) ChaosVersion() (string, error) {
+func (r *Recipe) ChaosVersion() (string, error) {
 	var version string
 
 	head, err := r.Head()
@@ -241,15 +300,10 @@ func (r Recipe) ChaosVersion() (string, error) {
 
 	version = formatter.SmallSHA(head.String())
 
-	isClean, err := gitPkg.IsClean(r.Dir)
-	if err != nil {
+	if err := r.IsDirty(); err != nil {
 		return version, err
 	}
 
-	if !isClean {
-		version = fmt.Sprintf("%s+U", version)
-	}
-
 	return version, nil
 }
 
@@ -293,29 +347,44 @@ func (r Recipe) Tags() ([]string, error) {
 		return tags, err
 	}
 
+	sort.Slice(tags, func(i, j int) bool {
+		version1, err := tagcmp.Parse(tags[i])
+		if err != nil {
+			return false
+		}
+		version2, err := tagcmp.Parse(tags[j])
+		if err != nil {
+			return false
+		}
+		return version1.IsLessThan(version2)
+	})
+
 	log.Debugf("detected %s as tags for recipe %s", strings.Join(tags, ", "), r.Name)
 
 	return tags, nil
 }
 
 // GetRecipeVersions retrieves all recipe versions.
-func (r Recipe) GetRecipeVersions() (RecipeVersions, error) {
+func (r Recipe) GetRecipeVersions() (RecipeVersions, []string, error) {
+	var warnMsg []string
+
 	versions := RecipeVersions{}
-	log.Debugf("attempting to open git repository in %s", r.Dir)
+
+	log.Debugf("git: opening repository in %s", r.Dir)
 
 	repo, err := git.PlainOpen(r.Dir)
 	if err != nil {
-		return versions, err
+		return versions, warnMsg, nil
 	}
 
 	worktree, err := repo.Worktree()
 	if err != nil {
-		return versions, err
+		return versions, warnMsg, nil
 	}
 
 	gitTags, err := repo.Tags()
 	if err != nil {
-		return versions, err
+		return versions, warnMsg, nil
 	}
 
 	if err := gitTags.ForEach(func(ref *plumbing.Reference) (err error) {
@@ -333,7 +402,7 @@ func (r Recipe) GetRecipeVersions() (RecipeVersions, error) {
 			return err
 		}
 
-		log.Debugf("successfully checked out %s in %s", ref.Name(), r.Dir)
+		log.Debugf("git checkout: %s in %s", ref.Name(), r.Dir)
 
 		config, err := r.GetComposeConfig(nil)
 		if err != nil {
@@ -357,7 +426,7 @@ func (r Recipe) GetRecipeVersions() (RecipeVersions, error) {
 			case reference.NamedTagged:
 				tag = img.(reference.NamedTagged).Tag()
 			case reference.Named:
-				log.Warnf("%s service is missing image tag?", path)
+				warnMsg = append(warnMsg, fmt.Sprintf("%s service is missing image tag?", path))
 				continue
 			}
 
@@ -371,19 +440,26 @@ func (r Recipe) GetRecipeVersions() (RecipeVersions, error) {
 
 		return nil
 	}); err != nil {
-		return versions, err
+		return versions, warnMsg, nil
 	}
 
 	_, err = gitPkg.CheckoutDefaultBranch(repo, r.Dir)
 	if err != nil {
-		return versions, err
+		return versions, warnMsg, nil
 	}
 
 	sortRecipeVersions(versions)
 
 	log.Debugf("collected %s for %s", versions, r.Dir)
 
-	return versions, nil
+	var uniqueWarnings []string
+	for _, w := range warnMsg {
+		if !slices.Contains(uniqueWarnings, w) {
+			uniqueWarnings = append(uniqueWarnings, w)
+		}
+	}
+
+	return versions, uniqueWarnings, nil
 }
 
 // Head retrieves latest HEAD metadata.

pkg/recipe/git_test.go

@@ -0,0 +1,39 @@
+package recipe
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestIsDirty(t *testing.T) {
+	r := Get("abra-test-recipe")
+
+	if err := r.EnsureExists(); err != nil {
+		t.Fatal(err)
+	}
+
+	if err := r.IsDirty(); err != nil {
+		t.Fatal(err)
+	}
+
+	assert.False(t, r.Dirty)
+
+	fpath := filepath.Join(r.Dir, "foo.txt")
+	f, err := os.Create(fpath)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer f.Close()
+	defer t.Cleanup(func() {
+		os.Remove(fpath)
+	})
+
+	if err := r.IsDirty(); err != nil {
+		t.Fatal(err)
+	}
+
+	assert.True(t, r.Dirty)
+}

pkg/recipe/recipe.go

@@ -2,12 +2,12 @@ package recipe
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io/ioutil"
 	"net/url"
 	"os"
 	"path"
-	"slices"
 	"sort"
 	"strconv"
 	"strings"
@@ -20,6 +20,7 @@ import (
 	"coopcloud.tech/abra/pkg/log"
 	"coopcloud.tech/abra/pkg/web"
 	"coopcloud.tech/tagcmp"
+	"github.com/go-git/go-git/v5"
 )
 
 // RecipeCatalogueURL is the only current recipe catalogue available.
@@ -57,11 +58,6 @@ type RecipeMeta struct {
 	Website       string         `json:"website"`
 }
 
-// TopicMeta represents a list of topics for a repository.
-type TopicMeta struct {
-	Topics []string `json:"topics"`
-}
-
 // LatestVersion returns the latest version of a recipe.
 func (r RecipeMeta) LatestVersion() string {
 	var version string
@@ -123,6 +119,20 @@ type Features struct {
 	SSO         string `json:"sso"`
 }
 
+func GetEnvVersionRaw(name string) (string, error) {
+	var version string
+
+	if strings.Contains(name, ":") {
+		split := strings.Split(name, ":")
+		if len(split) > 2 {
+			return version, fmt.Errorf("version seems invalid: %s", name)
+		}
+		version = split[1]
+	}
+
+	return version, nil
+}
+
 func Get(name string) Recipe {
 	version := ""
 	if strings.Contains(name, ":") {
@@ -131,11 +141,16 @@ func Get(name string) Recipe {
 			log.Fatalf("version seems invalid: %s", name)
 		}
 		name = split[0]
+
 		version = split[1]
+		if strings.HasSuffix(version, config.DIRTY_DEFAULT) {
+			version = strings.Replace(split[1], config.DIRTY_DEFAULT, "", 1)
+			log.Debugf("removed dirty suffix from .env version: %s -> %s", split[1], version)
+		}
 	}
 
 	gitURL := fmt.Sprintf("%s/%s.git", config.REPOS_BASE_URL, name)
-	sshURL := fmt.Sprintf(config.SSH_URL_TEMPLATE, name)
+	sshURL := fmt.Sprintf(config.RECIPES_SSH_URL_TEMPLATE, name)
 	if strings.Contains(name, "/") {
 		u, err := url.Parse(name)
 		if err != nil {
@@ -151,9 +166,9 @@ func Get(name string) Recipe {
 
 	dir := path.Join(config.RECIPES_DIR, escapeRecipeName(name))
 
-	return Recipe{
+	r := Recipe{
 		Name:       name,
-		Version: version,
+		EnvVersion: version,
 		Dir:        dir,
 		GitURL:     gitURL,
 		SSHURL:     sshURL,
@@ -163,11 +178,18 @@ func Get(name string) Recipe {
 		SampleEnvPath: path.Join(dir, ".env.sample"),
 		AbraShPath:    path.Join(dir, "abra.sh"),
 	}
+
+	if err := r.IsDirty(); err != nil && !errors.Is(err, git.ErrRepositoryNotExists) {
+		log.Fatalf("failed to check git status of %s: %s", r.Name, err)
+	}
+
+	return r
 }
 
 type Recipe struct {
 	Name       string
-	Version string
+	EnvVersion string
+	Dirty      bool // NOTE(d1): git terminology for unstaged changes
 	Dir        string
 	GitURL     string
 	SSHURL     string
@@ -178,6 +200,21 @@ type Recipe struct {
 	AbraShPath    string
 }
 
+// String outputs a human-friendly string representation.
+func (r Recipe) String() string {
+	out := fmt.Sprintf("{name: %s, ", r.Name)
+	out += fmt.Sprintf("version : %s, ", r.EnvVersion)
+	out += fmt.Sprintf("dirty: %v, ", r.Dirty)
+	out += fmt.Sprintf("dir: %s, ", r.Dir)
+	out += fmt.Sprintf("git url: %s, ", r.GitURL)
+	out += fmt.Sprintf("ssh url: %s, ", r.SSHURL)
+	out += fmt.Sprintf("compose: %s, ", r.ComposePath)
+	out += fmt.Sprintf("readme: %s, ", r.ReadmePath)
+	out += fmt.Sprintf("sample env: %s, ", r.SampleEnvPath)
+	out += fmt.Sprintf("abra.sh: %s}", r.AbraShPath)
+	return out
+}
+
 func escapeRecipeName(recipeName string) string {
 	recipeName = strings.ReplaceAll(recipeName, "/", "_")
 	recipeName = strings.ReplaceAll(recipeName, ".", "_")
@@ -196,16 +233,18 @@ func GetRecipesLocal() ([]string, error) {
 	return recipes, nil
 }
 
-func GetRecipeFeaturesAndCategory(r Recipe) (Features, string, error) {
-	feat := Features{}
+func GetRecipeFeaturesAndCategory(r Recipe) (Features, string, []string, error) {
+	var (
+		category string
+		warnMsgs []string
+		feat     = Features{}
+	)
 
-	var category string
-
-	log.Debugf("attempting to open %s for recipe metadata parsing", r.ReadmePath)
+	log.Debugf("%s: attempt recipe metadata parse", r.ReadmePath)
 
 	readmeFS, err := ioutil.ReadFile(r.ReadmePath)
 	if err != nil {
-		return feat, category, err
+		return feat, category, warnMsgs, err
 	}
 
 	readmeMetadata, err := GetStringInBetween( // Find text between delimiters
@@ -214,7 +253,7 @@ func GetRecipeFeaturesAndCategory(r Recipe) (Features, string, error) {
 		"<!-- metadata -->", "<!-- endmetadata -->",
 	)
 	if err != nil {
-		return feat, category, err
+		return feat, category, warnMsgs, err
 	}
 
 	readmeLines := strings.Split( // Array item from lines
@@ -258,20 +297,25 @@ func GetRecipeFeaturesAndCategory(r Recipe) (Features, string, error) {
 			)
 		}
 		if strings.Contains(val, "**Image**") {
-			imageMetadata, err := GetImageMetadata(strings.TrimSpace(
+			imageMetadata, warnings, err := GetImageMetadata(strings.TrimSpace(
 				strings.TrimPrefix(val, "* **Image**:"),
 			), r.Name)
 			if err != nil {
 				continue
 			}
+			if len(warnings) > 0 {
+				warnMsgs = append(warnMsgs, warnings...)
+			}
 			feat.Image = imageMetadata
 		}
 	}
 
-	return feat, category, nil
+	return feat, category, warnMsgs, nil
 }
 
-func GetImageMetadata(imageRowString, recipeName string) (Image, error) {
+func GetImageMetadata(imageRowString, recipeName string) (Image, []string, error) {
+	var warnMsgs []string
+
 	img := Image{}
 
 	imgFields := strings.Split(imageRowString, ",")
@@ -282,11 +326,18 @@ func GetImageMetadata(imageRowString, recipeName string) (Image, error) {
 
 	if len(imgFields) < 3 {
 		if imageRowString != "" {
-			log.Warnf("%s image meta has incorrect format: %s", recipeName, imageRowString)
+			warnMsgs = append(
+				warnMsgs,
+				fmt.Sprintf("%s: image meta has incorrect format: %s", recipeName, imageRowString),
+			)
 		} else {
-			log.Warnf("%s image meta is empty?", recipeName)
+			warnMsgs = append(
+				warnMsgs,
+				fmt.Sprintf("%s: image meta is empty?", recipeName),
+			)
 		}
-		return img, nil
+
+		return img, warnMsgs, nil
 	}
 
 	img.Rating = imgFields[1]
@@ -296,17 +347,17 @@ func GetImageMetadata(imageRowString, recipeName string) (Image, error) {
 
 	imageName, err := GetStringInBetween(recipeName, imgString, "[", "]")
 	if err != nil {
-		log.Fatal(err)
+		return img, warnMsgs, err
 	}
 	img.Image = strings.ReplaceAll(imageName, "`", "")
 
 	imageURL, err := GetStringInBetween(recipeName, imgString, "(", ")")
 	if err != nil {
-		log.Fatal(err)
+		return img, warnMsgs, err
 	}
 	img.URL = imageURL
 
-	return img, nil
+	return img, warnMsgs, nil
 }
 
 // GetStringInBetween returns empty string if no start or end string found
@@ -497,11 +548,11 @@ type InternalTracker struct {
 type RepoCatalogue map[string]RepoMeta
 
 // ReadReposMetadata retrieves coop-cloud/... repo metadata from Gitea.
-func ReadReposMetadata() (RepoCatalogue, error) {
+func ReadReposMetadata(debug bool) (RepoCatalogue, error) {
 	reposMeta := make(RepoCatalogue)
 
 	pageIdx := 1
-	bar := formatter.CreateProgressbar(-1, "retrieving recipe repos list from git.coopcloud.tech...")
+	bar := formatter.CreateProgressbar(-1, "collecting recipe listing")
 	for {
 		var reposList []RepoMeta
 
@@ -514,28 +565,32 @@ func ReadReposMetadata() (RepoCatalogue, error) {
 		}
 
 		if len(reposList) == 0 {
+			if !debug {
 				bar.Add(1)
+			}
 			break
 		}
 
 		for idx, repo := range reposList {
-			var topicMeta TopicMeta
-
-			topicsURL := getReposTopicUrl(repo.Name)
-			if err := web.ReadJSON(topicsURL, &topicMeta); err != nil {
-				return reposMeta, err
+			// NOTE(d1): the "example" recipe is a temporary special case
+			// https://git.coopcloud.tech/toolshed/organising/issues/666
+			if repo.Name == "example" {
+				continue
 			}
 
-			if slices.Contains(topicMeta.Topics, "recipe") && repo.Name != "example" {
 			reposMeta[repo.Name] = reposList[idx]
 		}
-		}
 
 		pageIdx++
+
+		if !debug {
 			bar.Add(1)
 		}
+	}
 
-	fmt.Println() // newline for spinner
+	if err := bar.Close(); err != nil {
+		return reposMeta, err
+	}
 
 	return reposMeta, nil
 }
@@ -597,7 +652,7 @@ func GetRecipeCatalogueVersions(recipeName string, catl RecipeCatalogue) ([]stri
 }
 
 // UpdateRepositories clones and updates all recipe repositories locally.
-func UpdateRepositories(repos RepoCatalogue, recipeName string) error {
+func UpdateRepositories(repos RepoCatalogue, recipeName string, debug bool) error {
 	var barLength int
 	if recipeName != "" {
 		barLength = 1
@@ -605,9 +660,9 @@ func UpdateRepositories(repos RepoCatalogue, recipeName string) error {
 		barLength = len(repos)
 	}
 
-	cloneLimiter := limit.New(10)
+	cloneLimiter := limit.New(3)
 
-	retrieveBar := formatter.CreateProgressbar(barLength, "ensuring recipes are cloned & up-to-date...")
+	retrieveBar := formatter.CreateProgressbar(barLength, "retrieving recipes")
 	ch := make(chan string, barLength)
 	for _, repoMeta := range repos {
 		go func(rm RepoMeta) {
@@ -616,7 +671,9 @@ func UpdateRepositories(repos RepoCatalogue, recipeName string) error {
 
 			if recipeName != "" && recipeName != rm.Name {
 				ch <- rm.Name
+				if !debug {
 					retrieveBar.Add(1)
+				}
 				return
 			}
 
@@ -625,7 +682,9 @@ func UpdateRepositories(repos RepoCatalogue, recipeName string) error {
 			}
 
 			ch <- rm.Name
+			if !debug {
 				retrieveBar.Add(1)
+			}
 		}(repoMeta)
 	}
 
@@ -633,12 +692,11 @@ func UpdateRepositories(repos RepoCatalogue, recipeName string) error {
 		<-ch // wait for everything
 	}
 
-	return nil
-}
+	if err := retrieveBar.Close(); err != nil {
+		return err
+	}
 
-// getReposTopicUrl retrieves the repository specific topic listing.
-func getReposTopicUrl(repoName string) string {
-	return fmt.Sprintf("https://git.coopcloud.tech/api/v1/repos/coop-cloud/%s/topics", repoName)
+	return nil
 }
 
 // ensurePathExists ensures that a path exists.

pkg/recipe/recipe_test.go

@@ -33,7 +33,7 @@ func TestGet(t *testing.T) {
 			name: "foo:1.2.3",
 			recipe: Recipe{
 				Name:          "foo",
-				Version:       "1.2.3",
+				EnvVersion:    "1.2.3",
 				Dir:           path.Join(cfg.GetAbraDir(), "/recipes/foo"),
 				GitURL:        "https://git.coopcloud.tech/coop-cloud/foo.git",
 				SSHURL:        "ssh://git@git.coopcloud.tech:2222/coop-cloud/foo.git",
@@ -60,7 +60,7 @@ func TestGet(t *testing.T) {
 			name: "mygit.org/myorg/cool-recipe:1.2.4",
 			recipe: Recipe{
 				Name:          "mygit.org/myorg/cool-recipe",
-				Version:       "1.2.4",
+				EnvVersion:    "1.2.4",
 				Dir:           path.Join(cfg.GetAbraDir(), "/recipes/mygit_org_myorg_cool-recipe"),
 				GitURL:        "https://mygit.org/myorg/cool-recipe.git",
 				SSHURL:        "ssh://git@mygit.org/myorg/cool-recipe.git",
@@ -105,3 +105,16 @@ func TestGetVersionLabelLocalDoesNotUseTimeoutLabel(t *testing.T) {
 		assert.NotEqual(t, label, defaultTimeoutLabel)
 	}
 }
+
+func TestDirtyMarkerRemoved(t *testing.T) {
+	r := Get("abra-test-recipe:1e83340e+U")
+	assert.Equal(t, "1e83340e", r.EnvVersion)
+}
+
+func TestGetEnvVersionRaw(t *testing.T) {
+	v, err := GetEnvVersionRaw("abra-test-recipe:1e83340e+U")
+	if err != nil {
+		t.Fatal(err)
+	}
+	assert.Equal(t, "1e83340e+U", v)
+}

pkg/ui/deploy.go

@@ -0,0 +1,421 @@
+package ui
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"fmt"
+	"io"
+	"strings"
+	"time"
+
+	"coopcloud.tech/abra/pkg/formatter"
+	"coopcloud.tech/abra/pkg/logs"
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
+	"github.com/docker/cli/cli/command/service/progress"
+	containerTypes "github.com/docker/docker/api/types/container"
+	"github.com/docker/docker/api/types/filters"
+	dockerClient "github.com/docker/docker/client"
+	"github.com/docker/docker/pkg/jsonmessage"
+	"github.com/muesli/reflow/wordwrap"
+)
+
+type statusMsg struct {
+	stream  stream
+	jsonMsg jsonmessage.JSONMessage
+}
+
+type healthState struct {
+	log string
+}
+
+type healthcheckMsg struct {
+	stream stream
+	state  healthState
+}
+
+type progressCompleteMsg struct {
+	stream stream
+
+	// NOTE(d1): failure scenarios are as follows
+	//           an error from ServiceProgress
+	//           a rollback
+	failed bool
+}
+
+type ServiceMeta struct {
+	Name string
+	ID   string
+}
+
+type Model struct {
+	appName string
+	cl      *dockerClient.Client
+	count   int
+	ctx     context.Context
+	err     error
+	info    string
+	timeout time.Duration
+	width   int
+
+	LogsBuffer *bytes.Buffer
+
+	Streams *[]stream
+	Failed  bool
+	Timeout bool
+}
+
+func (m Model) complete() bool {
+	if m.count == len(*m.Streams) {
+		return true
+	}
+	return false
+}
+
+type stream struct {
+	decoder           *json.Decoder
+	id                string
+	reader            *io.PipeReader
+	writer            *io.PipeWriter
+	overallStatus     string
+	rollbackStatus    string
+	verifyStatus      string
+	healthcheckStatus string
+
+	Err       error
+	ErrStatus string
+	Name      string
+}
+
+func (s stream) String() string {
+	out := fmt.Sprintf("{decoder: %v, ", s.decoder)
+	out += fmt.Sprintf("err: %v, ", s.Err)
+	out += fmt.Sprintf("id: %s, ", s.id)
+	out += fmt.Sprintf("name: %s, ", s.Name)
+	out += fmt.Sprintf("reader: %v, ", s.reader)
+	out += fmt.Sprintf("writer: %v, ", s.writer)
+	out += fmt.Sprintf("overallStatus: %s, ", s.overallStatus)
+	out += fmt.Sprintf("rollbackStatus: %s, ", s.rollbackStatus)
+	out += fmt.Sprintf("verifyStatus: %s, ", s.verifyStatus)
+	out += fmt.Sprintf("errStatus: %s, ", s.ErrStatus)
+	out += fmt.Sprintf("healthcheckStatus: %s}", s.healthcheckStatus)
+	return out
+}
+
+func (s stream) progress(m Model) tea.Msg {
+	if err := progress.ServiceProgress(m.ctx, m.cl, s.id, s.writer); err != nil {
+		s.Err = err
+		return progressCompleteMsg{
+			stream: s,
+			failed: true,
+		}
+	}
+
+	return progressCompleteMsg{stream: s}
+}
+
+func (s stream) process() tea.Msg {
+	var jsonMsg jsonmessage.JSONMessage
+
+	if err := s.decoder.Decode(&jsonMsg); err != nil {
+		if err == io.EOF {
+			// NOTE(d1): end processing messages
+			return nil
+		}
+
+		s.Err = err
+	}
+
+	return statusMsg{
+		stream:  s,
+		jsonMsg: jsonMsg,
+	}
+}
+
+func (s stream) healthcheck(m Model) tea.Msg {
+	filters := filters.NewArgs()
+	filters.Add("name", fmt.Sprintf("^%s", s.Name))
+
+	containers, err := m.cl.ContainerList(m.ctx, containerTypes.ListOptions{Filters: filters})
+	if err != nil {
+		s.Err = err
+		return healthcheckMsg{stream: s}
+	}
+
+	if len(containers) == 0 {
+		return healthcheckMsg{stream: s}
+	}
+
+	container := containers[0]
+	containerState, err := m.cl.ContainerInspect(m.ctx, container.ID)
+	if err != nil {
+		s.Err = err
+		return healthcheckMsg{stream: s}
+	}
+
+	var log string
+	if containerState.State.Health != nil {
+		if len(containerState.State.Health.Log) > 0 {
+			entry := containerState.State.Health.Log[0]
+			if entry.ExitCode < 0 {
+				log = entry.Output
+			}
+		}
+
+		return healthcheckMsg{
+			stream: s,
+			state:  healthState{log: log},
+		}
+	}
+
+	return healthcheckMsg{stream: s}
+}
+
+func DeployInitialModel(
+	ctx context.Context,
+	cl *dockerClient.Client,
+	services []ServiceMeta,
+	appName string,
+	timeout time.Duration,
+) Model {
+	var streams []stream
+	for _, service := range services {
+		r, w := io.Pipe()
+		d := json.NewDecoder(r)
+		streams = append(streams, stream{
+			Name:    service.Name,
+			id:      service.ID,
+			reader:  r,
+			writer:  w,
+			decoder: d,
+		})
+	}
+
+	infoRenderer := lipgloss.NewStyle().
+		Bold(true).
+		MaxWidth(4).
+		Foreground(lipgloss.Color("86"))
+	infoMarker := infoRenderer.Render("INFO")
+
+	var logsBuffer bytes.Buffer
+
+	return Model{
+		ctx:        ctx,
+		cl:         cl,
+		appName:    appName,
+		timeout:    timeout,
+		Streams:    &streams,
+		info:       infoMarker,
+		LogsBuffer: &logsBuffer,
+	}
+}
+
+func (m Model) Init() tea.Cmd {
+	var cmds []tea.Cmd
+
+	for _, stream := range *m.Streams {
+		cmds = append(
+			cmds,
+			[]tea.Cmd{
+				func() tea.Msg { return stream.progress(m) },
+				func() tea.Msg { return stream.process() },
+				func() tea.Msg { return stream.healthcheck(m) },
+			}...,
+		)
+	}
+
+	cmds = append(cmds, func() tea.Msg { return deployTimeout(m) })
+	cmds = append(cmds, func() tea.Msg { return m.gatherLogs() })
+
+	return tea.Batch(cmds...)
+}
+
+func (m Model) gatherLogs() tea.Msg {
+	var services []string
+	for _, s := range *m.Streams {
+		services = append(services, s.Name)
+	}
+
+	opts := logs.TailOpts{
+		AppName:  m.appName,
+		Services: services,
+		StdErr:   true,
+		Buffer:   m.LogsBuffer,
+		ToBuffer: true,
+	}
+
+	if err := logs.TailLogs(m.cl, opts); err != nil {
+		// TODO
+		// log.Debugf("gatherLogs: %s", err)
+	}
+
+	return nil
+}
+
+type timeoutMsg struct{}
+
+func deployTimeout(m Model) tea.Msg {
+	<-time.After(m.timeout)
+	return timeoutMsg{}
+}
+
+func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+	var cmds []tea.Cmd
+
+	switch msg := msg.(type) {
+	case tea.KeyMsg:
+		switch msg.String() {
+		case "ctrl+c", "q":
+			return m, tea.Quit
+		}
+
+	case tea.WindowSizeMsg:
+		m.width = msg.Width
+
+	case progressCompleteMsg:
+		if msg.failed {
+			m.Failed = true
+		}
+
+		m.count += 1
+
+		if m.complete() {
+			return m, tea.Quit
+		}
+
+	case healthcheckMsg:
+		if msg.state != (healthState{}) && msg.state.log != "" {
+			msg.stream.healthcheckStatus = strings.ToLower(msg.state.log)
+
+			if msg.stream.Err != nil {
+				msg.stream.ErrStatus = msg.stream.Err.Error()
+			}
+
+			for idx, s := range *m.Streams {
+				if s.id == msg.stream.id {
+					(*m.Streams)[idx].healthcheckStatus = msg.stream.healthcheckStatus
+				}
+			}
+		}
+
+		cmds = append(
+			cmds,
+			func() tea.Msg { return msg.stream.healthcheck(m) },
+		)
+
+	case timeoutMsg:
+		m.Timeout = true
+		return m, tea.Quit
+
+	case statusMsg:
+		switch msg.jsonMsg.ID {
+		case "rollback":
+			m.Failed = true
+			msg.stream.rollbackStatus = strings.ToLower(msg.jsonMsg.Status)
+		case "overall progress":
+			msg.stream.overallStatus = strings.ToLower(msg.jsonMsg.Status)
+		case "verify":
+			msg.stream.verifyStatus = strings.ToLower(msg.jsonMsg.Status)
+		}
+
+		if msg.stream.Err != nil {
+			msg.stream.ErrStatus = msg.stream.Err.Error()
+		}
+
+		for idx, s := range *m.Streams {
+			if s.id == msg.stream.id {
+				switch msg.jsonMsg.ID {
+				case "rollback":
+					(*m.Streams)[idx].rollbackStatus = msg.stream.rollbackStatus
+				case "overall progress":
+					(*m.Streams)[idx].overallStatus = msg.stream.overallStatus
+				case "verify":
+					(*m.Streams)[idx].verifyStatus = msg.stream.verifyStatus
+				}
+			}
+		}
+
+		cmds = append(
+			cmds,
+			func() tea.Msg { return msg.stream.process() },
+		)
+	}
+
+	return m, tea.Batch(cmds...)
+}
+
+func (m Model) View() string {
+	body := strings.Builder{}
+
+	for _, stream := range *m.Streams {
+		split := strings.Split(stream.Name, "_")
+		short := split[len(split)-1]
+
+		newLineSpacing := "       "
+		for range len(short) {
+			newLineSpacing += " "
+		}
+
+		output := fmt.Sprintf("%s %s: %s",
+			m.info,
+			formatter.BoldStyle.Render(short),
+			stream.overallStatus,
+		)
+
+		if stream.verifyStatus != "" {
+			output += fmt.Sprintf(" (%s)", stream.verifyStatus)
+		}
+
+		if stream.rollbackStatus != "" {
+			output += fmt.Sprintf("\n%s%s: %s",
+				newLineSpacing,
+				formatter.BoldUnderlineStyle.Render("ROLLBACK"),
+				stream.rollbackStatus,
+			)
+		}
+
+		if stream.healthcheckStatus != "" {
+			output += fmt.Sprintf("\n%s%s: %s",
+				newLineSpacing,
+				formatter.BoldUnderlineStyle.Render("HEALTHCHECK"),
+				wrapHealthstatus(m, stream, newLineSpacing),
+			)
+		}
+
+		if stream.ErrStatus != "" {
+			output += fmt.Sprintf("\n%s%s: %s",
+				newLineSpacing,
+				formatter.BoldUnderlineStyle.Render("ERROR"),
+				stream.ErrStatus,
+			)
+		}
+
+		body.WriteString(output)
+		body.WriteString("\n")
+	}
+
+	return body.String()
+}
+
+// wrapHealthstatus wraps the health check output which is mostly quite long.
+func wrapHealthstatus(m Model, s stream, newLineSpacing string) string {
+	// NOTE(d1): the spacing here represents "HEALTCHECK: ". 20 is an arbitrary
+	//           padding chosen in the hope of not overrunning horizontal space.
+	newLineSpacingWithIndent := newLineSpacing + "             "
+	firstWrap := wordwrap.String(
+		s.healthcheckStatus,
+		((m.width - len(newLineSpacingWithIndent)) - 20),
+	)
+
+	var finalWrap string
+	for idx, line := range strings.Split(firstWrap, "\n") {
+		if idx == 0 {
+			finalWrap = line
+			continue
+		}
+		finalWrap += fmt.Sprintf("\n%s%s", newLineSpacingWithIndent, line)
+	}
+
+	return finalWrap
+}

pkg/upstream/stack/remove.go

@@ -87,7 +87,7 @@ func removeServices(
 	var hasError bool
 	sort.Slice(services, sortServiceByName(services))
 	for _, service := range services {
-		log.Infof("removing service %s", service.Spec.Name)
+		log.Debugf("removing service %s", service.Spec.Name)
 		if err := client.ServiceRemove(ctx, service.ID); err != nil {
 			hasError = true
 			log.Fatalf("failed to remove service %s: %s", service.ID, err)
@@ -103,7 +103,7 @@ func removeNetworks(
 ) bool {
 	var hasError bool
 	for _, network := range networks {
-		log.Infof("removing network %s", network.Name)
+		log.Debugf("removing network %s", network.Name)
 		if err := client.NetworkRemove(ctx, network.ID); err != nil {
 			hasError = true
 			log.Fatalf("failed to remove network %s: %s", network.ID, err)
@@ -119,7 +119,7 @@ func removeSecrets(
 ) bool {
 	var hasError bool
 	for _, secret := range secrets {
-		log.Infof("removing secret %s", secret.Spec.Name)
+		log.Debugf("removing secret %s", secret.Spec.Name)
 		if err := client.SecretRemove(ctx, secret.ID); err != nil {
 			hasError = true
 			log.Fatalf("Failed to remove secret %s: %s", secret.ID, err)
@@ -135,7 +135,7 @@ func removeConfigs(
 ) bool {
 	var hasError bool
 	for _, config := range configs {
-		log.Infof("removing config %s", config.Spec.Name)
+		log.Debugf("removing config %s", config.Spec.Name)
 		if err := client.ConfigRemove(ctx, config.ID); err != nil {
 			hasError = true
 			log.Fatalf("failed to remove config %s: %s", config.ID, err)

pkg/upstream/stack/stack.go

@@ -3,19 +3,20 @@ package stack // https://github.com/docker/cli/blob/master/cli/command/stack/swa
 import (
 	"context"
 	"fmt"
-	"io"
-	"io/ioutil"
 	"os"
-	"os/signal"
+	"path/filepath"
 	"strconv"
 	"strings"
 	"time"
 
 	stdlibErr "errors"
 
+	tea "github.com/charmbracelet/bubbletea"
+
+	"coopcloud.tech/abra/pkg/config"
 	"coopcloud.tech/abra/pkg/log"
+	"coopcloud.tech/abra/pkg/ui"
 	"coopcloud.tech/abra/pkg/upstream/convert"
-	"github.com/docker/cli/cli/command/service/progress"
 	"github.com/docker/cli/cli/command/stack/formatter"
 	composetypes "github.com/docker/cli/cli/compose/types"
 	"github.com/docker/docker/api/types"
@@ -106,13 +107,22 @@ type DeployMeta struct {
 	ChaosVersion string // the --chaos deployment version
 }
 
+func (d DeployMeta) String() string {
+	var out string
+	out += fmt.Sprintf("{isDeployed: %v, ", d.IsDeployed)
+	out += fmt.Sprintf("version: %s, ", d.Version)
+	out += fmt.Sprintf("isChaos: %v, ", d.IsChaos)
+	out += fmt.Sprintf("chaosVersion: %s}", d.ChaosVersion)
+	return out
+}
+
 // IsDeployed gathers metadata about an app deployment.
 func IsDeployed(ctx context.Context, cl *dockerClient.Client, stackName string) (DeployMeta, error) {
 	deployMeta := DeployMeta{
 		IsDeployed:   false,
 		Version:      "unknown",
 		IsChaos:      false,
-		ChaosVersion: "false", // NOTE(d1): match string type used on label
+		ChaosVersion: config.CHAOS_DEFAULT,
 	}
 
 	filter := filters.NewArgs()
@@ -166,7 +176,7 @@ func IsDeployed(ctx context.Context, cl *dockerClient.Client, stackName string)
 func pruneServices(ctx context.Context, cl *dockerClient.Client, namespace convert.Namespace, services map[string]struct{}) {
 	oldServices, err := GetStackServices(ctx, cl, namespace.Name())
 	if err != nil {
-		log.Infof("failed to list services: %s", err)
+		log.Warnf("failed to list services: %s", err)
 	}
 
 	pruneServices := []swarm.Service{}
@@ -180,7 +190,16 @@ func pruneServices(ctx context.Context, cl *dockerClient.Client, namespace conve
 }
 
 // RunDeploy is the swarm implementation of docker stack deploy
-func RunDeploy(cl *dockerClient.Client, opts Deploy, cfg *composetypes.Config, appName string, dontWait bool) error {
+func RunDeploy(
+	cl *dockerClient.Client,
+	opts Deploy,
+	cfg *composetypes.Config,
+	appName string,
+	serverName string,
+	dontWait bool,
+) error {
+	log.Info("initialising deployment")
+
 	if err := validateResolveImageFlag(&opts); err != nil {
 		return err
 	}
@@ -190,7 +209,7 @@ func RunDeploy(cl *dockerClient.Client, opts Deploy, cfg *composetypes.Config, a
 		opts.ResolveImage = ResolveImageNever
 	}
 
-	return deployCompose(context.Background(), cl, opts, cfg, appName, dontWait)
+	return deployCompose(context.Background(), cl, opts, cfg, appName, serverName, dontWait)
 }
 
 // validateResolveImageFlag validates the opts.resolveImage command line option
@@ -203,7 +222,15 @@ func validateResolveImageFlag(opts *Deploy) error {
 	}
 }
 
-func deployCompose(ctx context.Context, cl *dockerClient.Client, opts Deploy, config *composetypes.Config, appName string, dontWait bool) error {
+func deployCompose(
+	ctx context.Context,
+	cl *dockerClient.Client,
+	opts Deploy,
+	config *composetypes.Config,
+	appName string,
+	serverName string,
+	dontWait bool,
+) error {
 	namespace := convert.NewNamespace(opts.Namespace)
 
 	if opts.Prune {
@@ -244,7 +271,14 @@ func deployCompose(ctx context.Context, cl *dockerClient.Client, opts Deploy, co
 		return err
 	}
 
-	serviceIDs, err := deployServices(ctx, cl, services, namespace, opts.SendRegistryAuth, opts.ResolveImage)
+	serviceIDs, err := deployServices(
+		ctx,
+		cl,
+		services,
+		namespace,
+		opts.SendRegistryAuth,
+		opts.ResolveImage,
+	)
 	if err != nil {
 		return err
 	}
@@ -254,14 +288,16 @@ func deployCompose(ctx context.Context, cl *dockerClient.Client, opts Deploy, co
 		return nil
 	}
 
-	log.Infof("waiting for %s to deploy... please hold 🤚", appName)
-
-	if err := waitOnServices(ctx, cl, serviceIDs, appName); err != nil {
+	if err := WaitOnServices(
+		ctx,
+		cl,
+		serviceIDs,
+		appName,
+		serverName,
+	); err != nil {
 		return err
 	}
 
-	log.Infof("successfully deployed %s", appName)
-
 	return nil
 }
 
@@ -332,7 +368,7 @@ func createConfigs(ctx context.Context, cl *dockerClient.Client, configs []swarm
 			}
 		case dockerClient.IsErrNotFound(err):
 			// config does not exist, then we create a new one.
-			log.Infof("creating config %s", configSpec.Name)
+			log.Debugf("creating config %s", configSpec.Name)
 			if _, err := cl.ConfigCreate(ctx, configSpec); err != nil {
 				return errors.Wrapf(err, "failed to create config %s", configSpec.Name)
 			}
@@ -363,7 +399,7 @@ func createNetworks(ctx context.Context, cl *dockerClient.Client, namespace conv
 			createOpts.Driver = defaultNetworkDriver
 		}
 
-		log.Infof("creating network %s", name)
+		log.Debugf("creating network %s", name)
 		if _, err := cl.NetworkCreate(ctx, name, createOpts); err != nil {
 			return errors.Wrapf(err, "failed to create network %s", name)
 		}
@@ -377,10 +413,12 @@ func deployServices(
 	services map[string]swarm.ServiceSpec,
 	namespace convert.Namespace,
 	sendAuth bool,
-	resolveImage string) ([]string, error) {
+	resolveImage string) ([]ui.ServiceMeta, error) {
+	var servicesMeta []ui.ServiceMeta
+
 	existingServices, err := GetStackServices(ctx, cl, namespace.Name())
 	if err != nil {
-		return nil, err
+		return servicesMeta, err
 	}
 
 	existingServiceMap := make(map[string]swarm.Service)
@@ -388,8 +426,6 @@ func deployServices(
 		existingServiceMap[service.Spec.Name] = service
 	}
 
-	var serviceIDs []string
-
 	for internalName, serviceSpec := range services {
 		var (
 			name        = namespace.Scope(internalName)
@@ -398,7 +434,7 @@ func deployServices(
 		)
 
 		if service, exists := existingServiceMap[name]; exists {
-			log.Infof("updating %s", name)
+			log.Debugf("updating %s", name)
 
 			updateOpts := types.ServiceUpdateOptions{EncodedRegistryAuth: encodedAuth}
 
@@ -440,9 +476,12 @@ func deployServices(
 				log.Warn(warning)
 			}
 
-			serviceIDs = append(serviceIDs, service.ID)
+			servicesMeta = append(servicesMeta, ui.ServiceMeta{
+				Name: name,
+				ID:   service.ID,
+			})
 		} else {
-			log.Infof("creating %s", name)
+			log.Debugf("creating %s", name)
 
 			createOpts := types.ServiceCreateOptions{EncodedRegistryAuth: encodedAuth}
 
@@ -456,11 +495,14 @@ func deployServices(
 				return nil, errors.Wrapf(err, "failed to create %s", name)
 			}
 
-			serviceIDs = append(serviceIDs, serviceCreateResponse.ID)
+			servicesMeta = append(servicesMeta, ui.ServiceMeta{
+				Name: name,
+				ID:   serviceCreateResponse.ID,
+			})
 		}
 	}
 
-	return serviceIDs, nil
+	return servicesMeta, nil
 }
 
 func getStackNetworks(ctx context.Context, dockerclient client.APIClient, namespace string) ([]types.NetworkResource, error) {
@@ -475,69 +517,72 @@ func getStackConfigs(ctx context.Context, dockerclient client.APIClient, namespa
 	return dockerclient.ConfigList(ctx, types.ConfigListOptions{Filters: getStackFilter(namespace)})
 }
 
-func waitOnServices(ctx context.Context, cl *dockerClient.Client, serviceIDs []string, appName string) error {
+func timestamp() string {
+	ts := time.Now().UTC().Format(time.RFC3339)
+	return strings.Replace(ts, ":", "", -1) // get rid of offensive colons
+}
+
+func WaitOnServices(
+	ctx context.Context,
+	cl *dockerClient.Client,
+	services []ui.ServiceMeta,
+	appName string,
+	serverName string,
+) error {
+	log.Info("polling deployment status")
+
+	timeout := time.Duration(WaitTimeout) * time.Second
+	model := ui.DeployInitialModel(ctx, cl, services, appName, timeout)
+	tui := tea.NewProgram(model)
+
+	m, err := tui.Run()
+	if err != nil {
+		return err
+	}
+
+	deployModel := m.(ui.Model)
+
+	logsPath := filepath.Join(
+		config.LOGS_DIR,
+		serverName,
+		fmt.Sprintf("%s_%s", appName, timestamp()),
+	)
+
+	if err := os.MkdirAll(filepath.Join(config.LOGS_DIR, serverName), 0644); err != nil {
+		// TODO
+		log.Fatalf("MkdirAll: %s", err)
+	}
+
+	if deployModel.Timeout {
+		if err := os.WriteFile(logsPath, deployModel.LogsBuffer.Bytes(), 0644); err != nil {
+			// TODO
+			log.Fatalf("WriteFile: %s", err)
+		}
+		return fmt.Errorf("deployment timed out, logs in %s", logsPath)
+	}
+
+	if deployModel.Failed {
 		var errs []error
 
-	for _, serviceID := range serviceIDs {
-		if err := WaitOnService(ctx, cl, serviceID, appName); err != nil {
-			errs = append(errs, fmt.Errorf("%s: %w", serviceID, err))
+		for _, s := range *deployModel.Streams {
+			if s.Err != nil {
+				errs = append(errs, fmt.Errorf("%s: %s", s.Name, s.ErrStatus))
 			}
 		}
 
-	if len(errs) > 0 {
+		if err := os.WriteFile(logsPath, deployModel.LogsBuffer.Bytes(), 0644); err != nil {
+			// TODO
+			log.Fatalf("WriteFile: %s", err)
+		}
+
+		errs = append(errs, fmt.Errorf("deployment failed, logs in %s", logsPath))
+
 		return stdlibErr.Join(errs...)
 	}
 
 	return nil
 }
 
-// https://github.com/docker/cli/blob/master/cli/command/service/helpers.go
-// https://github.com/docker/cli/blob/master/cli/command/service/progress/progress.go
-func WaitOnService(ctx context.Context, cl *dockerClient.Client, serviceID, appName string) error {
-	errChan := make(chan error, 1)
-	pipeReader, pipeWriter := io.Pipe()
-
-	sigintChannel := make(chan os.Signal, 1)
-	signal.Notify(sigintChannel, os.Interrupt)
-	defer signal.Stop(sigintChannel)
-
-	go func() {
-		errChan <- progress.ServiceProgress(ctx, cl, serviceID, pipeWriter)
-	}()
-
-	go io.Copy(ioutil.Discard, pipeReader)
-
-	timeout := time.Duration(WaitTimeout) * time.Second
-
-	select {
-	case err := <-errChan:
-		return err
-	case <-sigintChannel:
-		return fmt.Errorf(`
-Not waiting for %s to deploy. The deployment is ongoing...
-
-If you want to stop the deployment, try:
-
-    abra app undeploy %s`, appName, appName)
-	case <-time.After(timeout):
-		return fmt.Errorf(`
-%s has not converged (%s second timeout reached).
-
-This does not necessarily mean your deployment has failed, it may just be that
-the app is taking longer to deploy based on your server resources or network
-latency.
-
-You can track latest deployment status with:
-
-    abra app ps %s
-
-And inspect the logs with:
-
-    abra app logs %s
-`, appName, timeout, appName, appName)
-	}
-}
-
 // Copypasta from https://github.com/docker/cli/blob/master/cli/command/stack/swarm/list.go
 // GetStacks lists the swarm stacks.
 func GetStacks(cl *dockerClient.Client) ([]*formatter.Stack, error) {

scripts/installer/installer

@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 
 ABRA_VERSION="0.9.0-beta"
-ABRA_RELEASE_URL="https://git.coopcloud.tech/api/v1/repos/coop-cloud/abra/releases/tags/$ABRA_VERSION"
-RC_VERSION="0.8.0-rc1-beta"
-RC_VERSION_URL="https://git.coopcloud.tech/api/v1/repos/coop-cloud/abra/releases/tags/$RC_VERSION"
+ABRA_RELEASE_URL="https://git.coopcloud.tech/api/v1/repos/toolshed/abra/releases/tags/$ABRA_VERSION"
+RC_VERSION="0.10.0-rc1-beta"
+RC_VERSION_URL="https://git.coopcloud.tech/api/v1/repos/toolshed/abra/releases/tags/$RC_VERSION"
 
 for arg in "$@"; do
   if [ "$arg" == "--rc" ]; then
@@ -40,7 +40,7 @@ function install_abra_release {
   if ! type "wget" > /dev/null 2>&1; then
     echo "'wget' is not installed, cannot proceed..."
     echo "perhaps try installing manually via the releases URL?"
-    echo "https://git.coopcloud.tech/coop-cloud/abra/releases"
+    echo "https://git.coopcloud.tech/toolshed/abra/releases"
     exit 1
   fi
 

scripts/tests/run-ci-int

@@ -42,7 +42,7 @@ echo "========================================================================"
 echo "CLONING ABRA"
 echo "========================================================================"
 rm -rf abra
-git clone ssh://git@git.coopcloud.tech:2222/coop-cloud/abra.git
+git clone ssh://git@git.coopcloud.tech:2222/toolshed/abra.git
 cd abra
 git checkout main
 echo "========================================================================"

tests/integration/app_check.bats

@@ -50,6 +50,9 @@ teardown(){
   assert_failure
   assert_output --partial 'locally unstaged changes'
 
+  assert_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+  assert_equal "$(_git_status)" "?? foo"
+
   run rm -rf "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
   assert_not_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
 }
@@ -62,6 +65,9 @@ teardown(){
   run $ABRA app check "$TEST_APP_DOMAIN" --chaos
   assert_success
 
+  assert_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+  assert_equal "$(_git_status)" "?? foo"
+
   run rm -rf "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
   assert_not_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
 }

tests/integration/app_cmd.bats

@@ -53,6 +53,9 @@ teardown(){
   assert_failure
   assert_output --partial 'locally unstaged changes'
 
+  assert_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+  assert_equal "$(_git_status)" "?? foo"
+
   run rm -rf "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
   assert_not_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
 }
@@ -66,6 +69,9 @@ teardown(){
   assert_success
   assert_output --partial 'baz'
 
+  assert_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+  assert_equal "$(_git_status)" "?? foo"
+
   run rm -rf "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
   assert_not_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
 }

tests/integration/app_cp.bats

@@ -24,6 +24,9 @@ teardown(){
   _rm_remote "/etc/*.txt"
 
   _rm "$BATS_TMPDIR/mydir"
+
+  run rm -rf "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+  assert_not_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
 }
 
 @test "validate app argument" {
@@ -34,6 +37,42 @@ teardown(){
   assert_failure
 }
 
+@test "bail if unstaged changes and no --chaos" {
+  _mkdir "$BATS_TMPDIR/mydir"
+  _mkfile "$BATS_TMPDIR/mydir/myfile.txt" "foo"
+
+  run bash -c "echo foo >> $ABRA_DIR/recipes/$TEST_RECIPE/foo"
+  assert_success
+  assert_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+
+  run $ABRA app cp "$TEST_APP_DOMAIN" "$BATS_TMPDIR/mydir" app:/etc
+  assert_failure
+
+  assert_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+  assert_equal "$(_git_status)" "?? foo"
+
+  run rm -rf "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+  assert_not_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+}
+
+@test "do not bail if unstaged changes and --chaos" {
+  _mkdir "$BATS_TMPDIR/mydir"
+  _mkfile "$BATS_TMPDIR/mydir/myfile.txt" "foo"
+
+  run bash -c "echo foo >> $ABRA_DIR/recipes/$TEST_RECIPE/foo"
+  assert_success
+  assert_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+
+  run $ABRA app cp "$TEST_APP_DOMAIN" "$BATS_TMPDIR/mydir" app:/etc --chaos
+  assert_success
+
+  assert_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+  assert_equal "$(_git_status)" "?? foo"
+
+  run rm -rf "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+  assert_not_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+}
+
 @test "error if missing src/dest arguments" {
   run $ABRA app cp "$TEST_APP_DOMAIN"
   assert_failure

tests/integration/app_deploy.bats

@@ -21,8 +21,8 @@ setup(){
 
 teardown(){
   _reset_recipe
-  _reset_app
   _undeploy_app
+  _reset_app
   _reset_tags
 
   run rm -rf "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
@@ -46,6 +46,9 @@ teardown(){
   assert_success
   assert_output --partial 'foo'
 
+  assert_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+  assert_equal "$(_git_status)" "?? foo"
+
   run $ABRA app deploy "$TEST_APP_DOMAIN" --no-input
   assert_failure
   assert_output --partial 'locally unstaged changes'
@@ -62,10 +65,12 @@ teardown(){
   assert_success
   assert_output --partial 'foo'
 
+  assert_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+  assert_equal "$(_git_status)" "?? foo"
+
   run $ABRA app deploy "$TEST_APP_DOMAIN" \
     --chaos --no-input --no-converge-checks
   assert_success
-  assert_output --partial 'NEW CHAOS'
 }
 
 # bats test_tags=slow
@@ -128,7 +133,6 @@ teardown(){
     --no-input --no-converge-checks --chaos
   assert_success
   assert_output --partial "${wantHash:0:8}"
-  assert_output --partial 'NEW CHAOS'
 }
 
 # bats test_tags=slow
@@ -163,6 +167,32 @@ teardown(){
   assert_output --partial 'already deployed'
 }
 
+@test "no re-deploy after chaos deploy without --force/--chaos" {
+  run $ABRA app deploy "$TEST_APP_DOMAIN" \
+    --no-input --no-converge-checks --chaos
+  assert_success
+
+  run $ABRA app deploy "$TEST_APP_DOMAIN" \
+    --no-input --no-converge-checks
+  assert_failure
+
+  run $ABRA app deploy "$TEST_APP_DOMAIN" \
+    --no-input --no-converge-checks --chaos
+  assert_success
+
+  run $ABRA app deploy "$TEST_APP_DOMAIN" \
+    --no-input --no-converge-checks --force
+  assert_success
+}
+
+@test "no re-deploy without --force" {
+  _deploy_app
+
+  run $ABRA app deploy "$TEST_APP_DOMAIN" \
+    --no-input --no-converge-checks
+  assert_failure
+}
+
 # bats test_tags=slow
 @test "re-deploy deployed app if --force/--chaos" {
   _deploy_app
@@ -304,7 +334,6 @@ teardown(){
 
   run $ABRA app deploy "$TEST_APP_DOMAIN" --no-input --no-converge-checks
   assert_failure
-  assert_output --partial 'unable to deploy, secrets not generated'
 }
 
 # bats test_tags=slow
@@ -340,10 +369,72 @@ teardown(){
   run $ABRA app deploy "$TEST_APP_DOMAIN" "0.1.1+1.20.2" \
     --no-input --no-converge-checks
   assert_success
-  refute_output --partial 'no such file or directory'
 
   _undeploy_app
 
   run $ABRA app secret rm "$TEST_APP_DOMAIN" --all
   assert_success
 }
+
+# bats test_tags=slow
+@test "chaos version label includes dirty marker" {
+  run bash -c "echo foo >> $ABRA_DIR/recipes/$TEST_RECIPE/foo"
+  assert_success
+  assert_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+
+  run $ABRA app deploy "$TEST_APP_DOMAIN" \
+    --no-input --no-converge-checks --chaos
+  assert_success
+
+  run $ABRA app labels "$TEST_APP_DOMAIN" --chaos
+  assert_success
+  assert_output --regexp 'chaos-version.*+U'
+}
+
+# bats test_tags=slow
+@test "ignore env version checkout after deploy" {
+  tagHash=$(_get_tag_hash "0.1.0+1.20.0")
+
+  run $ABRA app deploy "$TEST_APP_DOMAIN" "0.1.0+1.20.0" \
+    --no-input --no-converge-checks
+  assert_success
+
+  assert_equal $(_get_current_hash) "$tagHash"
+
+  run $ABRA app check --ignore-env-version "$TEST_APP_DOMAIN"
+  assert_success
+
+  assert_equal $(_get_current_hash) "$(_get_head_hash)"
+
+  run $ABRA app check "$TEST_APP_DOMAIN"
+  assert_success
+
+  assert_equal $(_get_current_hash) "$tagHash"
+}
+
+# bats test_tags=slow
+@test "ignore env version on new deploy" {
+  tagHash=$(_get_tag_hash "0.1.0+1.20.0")
+
+  run $ABRA app deploy "$TEST_APP_DOMAIN" "0.1.0+1.20.0" \
+    --no-input --no-converge-checks
+  assert_success
+
+  _undeploy_app
+
+  latestRelease=$(_latest_release)
+
+  run $ABRA app deploy "$TEST_APP_DOMAIN" \
+    --no-input --no-converge-checks --ignore-env-version
+  assert_success
+  assert_output --partial "$latestRelease"
+}
+
+# bats test_tags=slow
+@test "no chaos version label if no chaos" {
+  _deploy_app
+
+  run $ABRA app labels "$TEST_APP_DOMAIN" --no-input
+  assert_success
+  refute_output --regexp "coop-cloud.abra-test-recipe.$TEST_SERVER.chaos-version"
+}

tests/integration/app_deploy_env_version.bats

@@ -54,13 +54,21 @@ teardown(){
 }
 
 # bats test_tags=slow
-@test "chaos commit written to env" {
+@test "deploy commit written to env and redeploy keeps that version" {
   run $ABRA app deploy "$TEST_APP_DOMAIN" "1e83340e" --no-input --no-converge-checks
   assert_success
 
   run grep -q "TYPE=$TEST_RECIPE:1e83340e" \
     "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
   assert_success
+
+  run $ABRA app deploy "$TEST_APP_DOMAIN" \
+    --force --no-input --no-converge-checks
+  assert_success
+
+  run grep -q "TYPE=$TEST_RECIPE:1e83340e" \
+    "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
+  assert_success
 }
 
 # bats test_tags=slow
@@ -91,9 +99,30 @@ teardown(){
   run $ABRA app deploy "$TEST_APP_DOMAIN" "0.2.0+1.21.0" \
     --no-input --no-converge-checks --force --debug
   assert_success
-  assert_output --partial "overriding env file version"
 
   run grep -q "TYPE=$TEST_RECIPE:0.2.0+1.21.0" \
     "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
   assert_success
 }
+
+# bats test_tags=slow
+@test "takes deployed version when no .env version is present " {
+  run $ABRA app deploy "$TEST_APP_DOMAIN" "0.1.0+1.20.0" --no-input --no-converge-checks --ignore-env-version
+  assert_success
+
+  run grep -q "TYPE=$TEST_RECIPE:0.1.0+1.20.0" \
+    "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
+  assert_success
+
+  run sed -i 's/TYPE=abra-test-recipe:.*/TYPE=abra-test-recipe/g' \
+    "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
+  assert_success
+
+  run $ABRA app deploy "$TEST_APP_DOMAIN" \
+    --force --no-input --no-converge-checks
+  assert_success
+
+  run grep -q "TYPE=$TEST_RECIPE:0.1.0+1.20.0" \
+    "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
+  assert_success
+}

tests/integration/app_deploy_overview.bats

@@ -0,0 +1,320 @@
+#!/usr/bin/env bash
+
+setup_file(){
+  load "$PWD/tests/integration/helpers/common"
+  _common_setup
+  _add_server
+  _new_app
+}
+
+teardown_file(){
+  _rm_app
+  _rm_server
+  _reset_recipe
+}
+
+setup(){
+  load "$PWD/tests/integration/helpers/common"
+  _common_setup
+}
+
+teardown(){
+  _reset_recipe
+  _undeploy_app
+  _reset_app
+  _reset_tags
+
+  run rm -rf "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+  assert_not_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+}
+
+@test "first deploy with empty env version" {
+  latestRelease=$(_latest_release)
+
+  _wipe_env_version
+
+  run $ABRA app deploy "$TEST_APP_DOMAIN" \
+    --no-input --no-converge-checks
+  assert_success
+
+  # current deployment
+  assert_output --regexp 'VERSION.*N/A'
+  assert_output --regexp 'CHAOS.*false'
+
+  # new deployment
+  assert_output --regexp 'VERSION.* ' + "${latestRelease}"
+  assert_output --regexp 'CHAOS.*false'
+
+  # env version
+  assert_output --regexp 'CURRENT VERSION.*N/A'
+  assert_output --regexp 'NEW VERSION.*' + "${latestRelease}"
+
+  run grep -q "TYPE=$TEST_RECIPE:${latestRelease}" \
+    "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
+  assert_success
+}
+
+@test "first deploy to latest version" {
+  latestRelease=$(_latest_release)
+
+  run $ABRA app deploy "$TEST_APP_DOMAIN" \
+    --no-input --no-converge-checks
+  assert_success
+
+  # current deployment
+  assert_output --regexp 'VERSION.*N/A'
+  assert_output --regexp 'CHAOS.*false'
+
+  # new deployment
+  assert_output --regexp 'VERSION.* ' + "${latestRelease}"
+  assert_output --regexp 'CHAOS.*false'
+
+  # env version
+  assert_output --regexp 'CURRENT VERSION.*' + "${latestRelease}"
+  assert_output --regexp 'NEW VERSION.*' + "${latestRelease}"
+
+  run grep -q "TYPE=$TEST_RECIPE:${latestRelease}" \
+    "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
+  assert_success
+}
+
+# bats test_tags=slow
+@test "deploy, re-deploy, choose env version" {
+  run $ABRA app deploy "$TEST_APP_DOMAIN" "0.1.1+1.20.2" \
+    --no-input --no-converge-checks
+  assert_success
+
+  _undeploy_app
+
+  run $ABRA app deploy "$TEST_APP_DOMAIN" \
+    --no-input --no-converge-checks
+  assert_success
+
+  # current deployment
+  assert_output --regexp 'VERSION.*N/A'
+  assert_output --regexp 'CHAOS.*false'
+
+  # new deployment
+  assert_output --regexp 'VERSION.*' + "0.1.1+1.20.2"
+  assert_output --regexp 'CHAOS.*false'
+
+  # env version
+  assert_output --regexp 'CURRENT VERSION.*' + "0.1.1+1.20.2"
+  assert_output --regexp 'NEW VERSION.*' + "0.1.1+1.20.2"
+
+  run grep -q "TYPE=$TEST_RECIPE:0.1.1+1.20.2" \
+    "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
+  assert_success
+}
+
+@test "deploy, re-deploy, ignore env version" {
+  latestRelease=$(_latest_release)
+
+  run $ABRA app deploy "$TEST_APP_DOMAIN" "0.1.1+1.20.2" \
+    --no-input --no-converge-checks
+  assert_success
+
+  _undeploy_app
+
+  run $ABRA app deploy "$TEST_APP_DOMAIN" \
+    --no-input --no-converge-checks --ignore-env-version
+  assert_success
+
+  # current deployment
+  assert_output --regexp 'VERSION.*N/A'
+  assert_output --regexp 'CHAOS.*false'
+
+  # new deployment
+  assert_output --regexp 'VERSION.*' + "${latestRelease}"
+  assert_output --regexp 'CHAOS.*false'
+
+  # env version
+  assert_output --regexp 'CURRENT VERSION.*' + "0.1.1+1.20.2"
+  assert_output --regexp 'NEW VERSION.*' + "${latestRelease}"
+
+  run grep -q "TYPE=$TEST_RECIPE:${latestRelease}" \
+    "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
+  assert_success
+}
+
+@test "deploy then chaos deploy" {
+  headHash=$(_get_head_hash)
+  latestRelease=$(_latest_release)
+
+  run $ABRA app deploy "$TEST_APP_DOMAIN" \
+    --no-input --no-converge-checks
+  assert_success
+
+  run bash -c 'echo "unstaged changes" >> "$ABRA_DIR/recipes/$TEST_RECIPE/foo"'
+  assert_success
+  assert_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+
+  run $ABRA app deploy "$TEST_APP_DOMAIN" \
+    --no-input --no-converge-checks --chaos
+  assert_success
+
+  # current deployment
+  assert_output --regexp 'VERSION.*' + "${latestRelease}"
+  assert_output --regexp 'CHAOS.*false'
+
+  # new deployment
+  assert_output --regexp 'VERSION.*' + "${latestRelease}"
+  assert_output --regexp 'CHAOS.*' + "${headHash:0:8}+U"
+
+  # env version
+  assert_output --regexp 'CURRENT VERSION.*' + "${latestRelease}"
+  assert_output --regexp 'NEW VERSION.*' + "${headHash:0:8}+U"
+
+  run rm -rf "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+  assert_not_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+
+  run grep -q "TYPE=$TEST_RECIPE:${headHash:0:8}" \
+    "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
+  assert_success
+}
+
+@test "chaos deploy then force deploy" {
+  headHash=$(_get_head_hash)
+  latestRelease=$(_latest_release)
+
+  run bash -c 'echo "unstaged changes" >> "$ABRA_DIR/recipes/$TEST_RECIPE/foo"'
+  assert_success
+  assert_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+
+  run $ABRA app deploy "$TEST_APP_DOMAIN" \
+    --no-input --no-converge-checks --chaos
+  assert_success
+
+  run rm -rf "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+  assert_not_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+
+  run $ABRA app deploy "$TEST_APP_DOMAIN" \
+    --no-input --no-converge-checks --force
+  assert_success
+
+  # current deployment
+  assert_output --regexp 'VERSION.*' + "${latestRelease}"
+  assert_output --regexp 'CHAOS.*' + "${headHash:0:8}+U"
+
+  # new deployment
+  assert_output --regexp 'VERSION.*' + "${latestRelease}"
+  assert_output --regexp 'CHAOS.*false'
+
+  # env version
+  assert_output --regexp 'CURRENT VERSION.*' + "${headHash:0:8}+U"
+  assert_output --regexp 'NEW VERSION.*' + "${latestRelease}"
+
+  run grep -q "TYPE=$TEST_RECIPE:${latestRelease}" \
+    "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
+  assert_success
+}
+
+@test "deploy then force chaos commit deploy" {
+  headHash=$(_get_head_hash)
+  latestRelease=$(_latest_release)
+
+  run $ABRA app deploy "$TEST_APP_DOMAIN" \
+    --no-input --no-converge-checks
+  assert_success
+
+  run grep -q "TYPE=$TEST_RECIPE:${latestRelease}" \
+    "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
+  assert_success
+
+  run $ABRA app deploy "$TEST_APP_DOMAIN" "${headHash:0:8}" \
+    --no-input --no-converge-checks --force
+  assert_success
+
+  # current deployment
+  assert_output --regexp 'VERSION.*' + "${latestRelease}"
+  assert_output --regexp 'CHAOS.*false'
+
+  # new deployment
+  assert_output --regexp 'VERSION.*' + "${latestRelease}"
+  assert_output --regexp 'CHAOS.*' + "${headHash:0:8}"
+
+  # env version
+  assert_output --regexp 'CURRENT VERSION.*' + "${latestRelease}"
+  assert_output --regexp 'NEW VERSION.*' + "${headHash:0:8}"
+
+  run grep -q "TYPE=$TEST_RECIPE:${headHash:0:8}" \
+    "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
+  assert_success
+}
+
+@test "chaos deploy then chaos deploy with unstaged" {
+  headHash=$(_get_head_hash)
+  latestRelease=$(_latest_release)
+
+  run $ABRA app deploy "$TEST_APP_DOMAIN" \
+    --no-input --no-converge-checks --chaos
+  assert_success
+
+  # current deployment
+  assert_output --regexp 'VERSION.*N/A'
+  assert_output --regexp 'CHAOS.*false'
+
+  # new deployment
+  assert_output --regexp 'VERSION.*' + "${latestRelease}"
+  assert_output --regexp 'CHAOS.*' + "${headHash:0:8}"
+
+  # env version
+  assert_output --regexp 'CURRENT VERSION.*' + "${latestRelease}"
+  assert_output --regexp 'NEW VERSION.*' + "${headHash:0:8}"
+
+  run bash -c 'echo "unstaged changes" >> "$ABRA_DIR/recipes/$TEST_RECIPE/foo"'
+  assert_success
+  assert_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+
+  run $ABRA app deploy "$TEST_APP_DOMAIN" \
+    --no-input --no-converge-checks --chaos
+  assert_success
+
+  # current deployment
+  assert_output --regexp 'VERSION.*' + "${latestRelease}"
+  assert_output --regexp 'CHAOS.*' + "${headHash:0:8}"
+
+  # new deployment
+  assert_output --regexp 'VERSION.*' + "${latestRelease}"
+  assert_output --regexp 'CHAOS.*' + "${headHash:0:8}+U"
+
+  # env version
+  assert_output --regexp 'CURRENT VERSION.*' + "${latestRelease}"
+  assert_output --regexp 'NEW VERSION.*' + "${headHash:0:8}+U"
+
+  run grep -q "TYPE=$TEST_RECIPE:${headHash:0:8}" \
+    "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
+  assert_success
+
+  run rm -rf "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+  assert_not_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+}
+
+@test "hash deploy then force deploy" {
+  headHash=$(_get_head_hash)
+  latestRelease=$(_latest_release)
+
+  run $ABRA app deploy "$TEST_APP_DOMAIN" "${headHash:0:8}" \
+    --no-input --no-converge-checks
+  assert_success
+
+  run $ABRA app deploy "$TEST_APP_DOMAIN" \
+    --no-input --no-converge-checks --force
+  assert_success
+
+  # current deployment
+  assert_output --regexp 'VERSION.*' + "${latestRelease}"
+  assert_output --regexp 'CHAOS.*' + "${headHash:0:8}"
+
+  # new deployment
+  assert_output --regexp 'VERSION.*' + "${latestRelease}"
+  assert_output --regexp 'CHAOS.*false'
+
+  # env version
+  assert_output --regexp 'CURRENT VERSION.*' + "${headHash:0:8}"
+  assert_output --regexp 'NEW VERSION.*' + "${latestRelease}"
+
+  run grep -q "TYPE=$TEST_RECIPE:${latestRelease}" \
+    "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
+  assert_success
+}

tests/integration/app_deploy_remote_recipes.bats

@@ -27,18 +27,18 @@ teardown(){
 
 # bats test_tags=slow
 @test "deploy remote recipe" {
-  run sed -i 's/TYPE=abra-test-recipe:.*/TYPE=git.coopcloud.tech\/coop-cloud\/abra-test-recipe/g' \
+  run sed -i 's/TYPE=abra-test-recipe:.*/TYPE=git.coopcloud.tech\/toolshed\/abra-test-recipe/g' \
     "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
   assert_success
 
   run $ABRA app deploy "$TEST_APP_DOMAIN" --no-input --no-converge-checks
   assert_success
-  assert_output --partial "git.coopcloud.tech/coop-cloud/abra-test-recipe"
+  assert_output --partial "git.coopcloud.tech/toolshed/abra-test-recipe"
 }
 
 # bats test_tags=slow
 @test "deploy remote recipe with version" {
-  run sed -i 's/TYPE=abra-test-recipe:.*/TYPE=git.coopcloud.tech\/coop-cloud\/abra-test-recipe:0.2.0+1.21.0/g' \
+  run sed -i 's/TYPE=abra-test-recipe:.*/TYPE=git.coopcloud.tech\/toolshed\/abra-test-recipe:0.2.0+1.21.0/g' \
     "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
   assert_success
 
@@ -49,7 +49,7 @@ teardown(){
 
 # bats test_tags=slow
 @test "deploy remote recipe with chaos commit" {
-  run sed -i 's/TYPE=abra-test-recipe:.*/TYPE=git.coopcloud.tech\/coop-cloud\/abra-test-recipe:1e83340e/g' \
+  run sed -i 's/TYPE=abra-test-recipe:.*/TYPE=git.coopcloud.tech\/toolshed\/abra-test-recipe:1e83340e/g' \
     "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
   assert_success
 
@@ -60,14 +60,14 @@ teardown(){
 
 # bats test_tags=slow
 @test "remote recipe version written to env" {
-  run sed -i 's/TYPE=abra-test-recipe:.*/TYPE=git.coopcloud.tech\/coop-cloud\/abra-test-recipe/g' \
+  run sed -i 's/TYPE=abra-test-recipe:.*/TYPE=git.coopcloud.tech\/toolshed\/abra-test-recipe/g' \
     "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
   assert_success
 
   run $ABRA app deploy "$TEST_APP_DOMAIN" --no-input --no-converge-checks
   assert_success
 
-  run grep -q "TYPE=git.coopcloud.tech\/coop-cloud\/abra-test-recipe:$(_latest_release)" \
+  run grep -q "TYPE=git.coopcloud.tech\/toolshed\/abra-test-recipe:$(_latest_release)" \
     "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
   assert_success
 }

tests/integration/app_env.bats

@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+
+setup_file(){
+  load "$PWD/tests/integration/helpers/common"
+  _common_setup
+  _add_server
+  _new_app
+}
+
+teardown_file(){
+  _rm_app
+  _rm_server
+  _reset_recipe
+}
+
+setup(){
+  load "$PWD/tests/integration/helpers/common"
+  _common_setup
+}
+
+teardown(){
+  _reset_recipe
+  _undeploy_app
+  _reset_app
+
+  run rm -rf "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+  assert_not_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+}
+
+@test "validate app argument" {
+  run $ABRA app env
+  assert_failure
+
+  run $ABRA app env DOESNTEXIST
+  assert_failure
+}
+
+@test "show env version" {
+  latestRelease=$(_latest_release)
+
+  run $ABRA app env "$TEST_APP_DOMAIN"
+  assert_success
+  assert_output --partial "$latestRelease"
+}
+
+@test "show env version despite --chaos" {
+  run bash -c "echo foo >> $ABRA_DIR/recipes/$TEST_RECIPE/foo"
+  assert_success
+  assert_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+
+  run $ABRA app env "$TEST_APP_DOMAIN"
+  assert_success
+
+  assert_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+  assert_equal "$(_git_status)" "?? foo"
+
+  run rm -rf "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+  assert_not_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+}

tests/integration/app_labels.bats

@@ -0,0 +1,109 @@
+#!/usr/bin/env bash
+
+setup_file(){
+  load "$PWD/tests/integration/helpers/common"
+  _common_setup
+  _add_server
+  _new_app
+}
+
+teardown_file(){
+  _rm_app
+  _rm_server
+  _reset_recipe
+}
+
+setup(){
+  load "$PWD/tests/integration/helpers/common"
+  _common_setup
+  _ensure_catalogue
+}
+
+teardown(){
+  _reset_recipe
+  _undeploy_app
+  _reset_app
+  _reset_tags
+
+  run rm -rf "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+  assert_not_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+}
+
+@test "validate app argument" {
+  run $ABRA app labels
+  assert_failure
+
+  run $ABRA app labels DOESNTEXIST
+  assert_failure
+}
+
+@test "bail if unstaged changes and no --chaos" {
+  run bash -c "echo foo >> $ABRA_DIR/recipes/$TEST_RECIPE/foo"
+  assert_success
+  assert_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+
+  run git -C "$ABRA_DIR/recipes/$TEST_RECIPE" status
+  assert_success
+  assert_output --partial 'foo'
+
+  assert_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+  assert_equal "$(_git_status)" "?? foo"
+
+  run $ABRA app labels "$TEST_APP_DOMAIN" --no-input
+  assert_failure
+}
+
+@test "do not bail if unstaged changes and --chaos" {
+  run bash -c 'echo "unstaged changes" >> "$ABRA_DIR/recipes/$TEST_RECIPE/foo"'
+  assert_success
+  assert_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+
+  run git -C "$ABRA_DIR/recipes/$TEST_RECIPE" status
+  assert_success
+  assert_output --partial 'foo'
+
+  assert_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+  assert_equal "$(_git_status)" "?? foo"
+
+  run $ABRA app labels "$TEST_APP_DOMAIN" --chaos
+  assert_success
+}
+
+@test "ensure recipe up to date if no --offline" {
+  wantHash=$(_get_n_hash 3)
+
+  run git -C "$ABRA_DIR/recipes/$TEST_RECIPE" reset --hard HEAD~3
+  assert_success
+
+  assert_equal $(_get_current_hash) "$wantHash"
+
+  run $ABRA app labels "$TEST_APP_DOMAIN"
+  assert_success
+
+  assert_equal $(_get_head_hash) $(_get_current_hash)
+}
+
+@test "ensure recipe not up to date if --offline" {
+  _ensure_env_version "0.1.0+1.20.0"
+  latestRelease=$(_latest_release)
+
+  run git -C "$ABRA_DIR/recipes/$TEST_RECIPE" tag -d "$latestRelease"
+  assert_success
+
+  run $ABRA app labels "$TEST_APP_DOMAIN" --offline
+  assert_success
+
+  run git -C "$ABRA_DIR/recipes/$TEST_RECIPE" tag -l
+  refute_output --partial "$latestRelease"
+}
+
+# bats test_tags=slow
+@test "show deploy labels when deployed" {
+  run $ABRA app deploy "$TEST_APP_DOMAIN" \
+    --no-input --no-converge-checks
+  assert_success
+
+  run $ABRA app labels "$TEST_APP_DOMAIN"
+  assert_success
+  assert_output --partial 'com.docker.stack.image'
+}

tests/integration/app_new.bats

@@ -20,6 +20,10 @@ setup(){
 teardown(){
   _rm_app
   _reset_recipe
+  _reset_tags
+
+  run rm -rf "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+  assert_not_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
 }
 
 @test "create new app" {
@@ -47,25 +51,22 @@ teardown(){
   assert_success
   assert_exists "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
 
-  assert_equal $(_get_tag_hash 0.3.0+1.21.0) $(_get_current_hash)
-
   run grep -q "TYPE=$TEST_RECIPE:0.3.0+1.21.0" \
     "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
   assert_success
 }
 
-@test "create new app with chaos commit" {
-  run $ABRA app new "$TEST_RECIPE" 1e83340e \
+@test "create new app with version commit" {
+  tagHash=$(_get_tag_hash "0.3.0+1.21.0")
+
+  run $ABRA app new "$TEST_RECIPE" "$tagHash" \
     --no-input \
     --server "$TEST_SERVER" \
     --domain "$TEST_APP_DOMAIN"
   assert_success
   assert_exists "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
 
-  currentHash=$(_get_current_hash)
-  assert_equal 1e83340e ${currentHash:0:8}
-
-  run grep -q "TYPE=$TEST_RECIPE:1e83340e" \
+  run grep -q "TYPE=$TEST_RECIPE:${tagHash}" \
     "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
   assert_success
 }
@@ -101,6 +102,9 @@ teardown(){
   assert_failure
   assert_output --partial 'locally unstaged changes'
 
+  assert_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+  assert_equal "$(_git_status)" "?? foo"
+
   run rm -rf "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
   assert_not_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
 }
@@ -122,6 +126,13 @@ teardown(){
   assert_success
   assert_exists "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
 
+  assert_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+  assert_equal "$(_git_status)" "?? foo"
+
+  run git -C "$ABRA_DIR/recipes/$TEST_RECIPE" status
+  assert_success
+  assert_output --partial 'foo'
+
   run rm -rf "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
   assert_not_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
 }
@@ -167,6 +178,8 @@ teardown(){
 
 # bats test_tags=slow
 @test "generate secrets" {
+  latestRelease=$(_latest_release)
+
   run $ABRA app new "$TEST_RECIPE" \
     --no-input \
     --server "$TEST_SERVER" \
@@ -178,4 +191,64 @@ teardown(){
   run $ABRA app secret ls "$TEST_APP_DOMAIN"
   assert_success
   assert_output --partial 'test_pass_one'
+
+  run grep -q "TYPE=$TEST_RECIPE:${latestRelease}" \
+    "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
+  assert_success
+}
+
+# bats test_tags=slow
+@test "app new from chaos recipe" {
+  currentHash=$(_get_current_hash)
+  latestRelease=$(_latest_release)
+
+  run bash -c "echo foo >> $ABRA_DIR/recipes/$TEST_RECIPE/foo"
+  assert_success
+  assert_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+
+  run $ABRA app new "$TEST_RECIPE" \
+    --no-input \
+    --server "$TEST_SERVER" \
+    --domain "$TEST_APP_DOMAIN" \
+    --secrets \
+    --chaos
+  assert_success
+  assert_exists "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
+  assert_output --partial "version: ${currentHash:0:8}"
+  assert_output --partial "chaos: ${currentHash:0:8}"
+
+  assert_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+  assert_equal "$(_git_status)" "?? foo"
+
+  run grep -q "TYPE=$TEST_RECIPE:${currentHash:0:8}+U" \
+    "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
+  assert_success
+}
+
+# bats test_tags=slow
+@test "app new, no releases, from chaos recipe" {
+  currentHash=$(_get_current_hash)
+  _remove_tags
+
+  run bash -c "echo foo >> $ABRA_DIR/recipes/$TEST_RECIPE/foo"
+  assert_success
+  assert_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+
+  run $ABRA app new "$TEST_RECIPE" \
+    --no-input \
+    --server "$TEST_SERVER" \
+    --domain "$TEST_APP_DOMAIN" \
+    --secrets \
+    --chaos
+  assert_success
+  assert_exists "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
+  assert_output --partial "version: ${currentHash:0:8}"
+  assert_output --partial "chaos: ${currentHash:0:8}"
+
+  assert_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+  assert_equal "$(_git_status)" "?? foo"
+
+  run grep -q "TYPE=$TEST_RECIPE:${currentHash:0:8}+U" \
+    "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
+  assert_success
 }

tests/integration/app_ps.bats

@@ -55,6 +55,9 @@ teardown(){
   assert_failure
   assert_output --partial 'locally unstaged changes'
 
+  assert_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+  assert_equal "$(_git_status)" "?? foo"
+
   run rm -rf "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
   assert_not_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
 }
@@ -70,6 +73,9 @@ teardown(){
   run $ABRA app ps --chaos "$TEST_APP_DOMAIN"
   assert_success
 
+  assert_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+  assert_equal "$(_git_status)" "?? foo"
+
   run rm -rf "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
   assert_not_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
 }
@@ -117,6 +123,8 @@ teardown(){
 @test "show ps report" {
   _deploy_app
 
+  _ensure_env_version "$(_latest_release)"
+
   run $ABRA app ps "$TEST_APP_DOMAIN"
   assert_success
   assert_output --partial 'app'
@@ -137,3 +145,16 @@ teardown(){
   assert_output --partial "$latestRelease"
   assert_output --partial "${headHash:0:8}" # is a chaos deploy
 }
+
+# bats test_tags=slow
+@test "ensure live chaos commit is shown" {
+  headHash=$(_get_head_hash)
+
+  run $ABRA app deploy "$TEST_APP_DOMAIN" "0f5a0570" --no-input 
+  assert_success
+
+  run $ABRA app ps "$TEST_APP_DOMAIN"
+  assert_success
+  assert_output --partial "0f5a0570" # is not latest HEAD
+  refute_output --partial "${headHash:0:8}"
+}

tests/integration/app_rollback.bats

@@ -19,6 +19,7 @@ setup(){
 }
 
 teardown(){
+  _reset_app
   _undeploy_app
   _reset_recipe
 }
@@ -129,6 +130,17 @@ teardown(){
   assert_output --partial "0.1.0+1.20.0"
 }
 
+@test "force rollback with no available downgrades" {
+  run $ABRA app deploy "$TEST_APP_DOMAIN" "0.1.0+1.20.0" \
+    --no-input --no-converge-checks
+  assert_success
+
+  run $ABRA app rollback "$TEST_APP_DOMAIN" \
+    --force --no-input --no-converge-checks
+  assert_success
+  assert_output --partial "0.1.0+1.20.0"
+}
+
 # bats test_tags=slow
 @test "rollback to a version 2 tags behind" {
   run $ABRA app deploy "$TEST_APP_DOMAIN" "0.2.0+1.21.0" --no-input --no-converge-checks
@@ -174,3 +186,16 @@ teardown(){
   assert_failure
   assert_output --partial "not a known version"
 }
+
+# bats test_tags=slow
+@test "no chaos version label if no chaos" {
+  _deploy_app
+
+  run $ABRA app rollback "$TEST_APP_DOMAIN" \
+    --no-input --no-converge-checks
+  assert_success
+
+  run $ABRA app labels "$TEST_APP_DOMAIN" --no-input
+  assert_success
+  refute_output --regexp "coop-cloud.abra-test-recipe.$TEST_SERVER.chaos-version"
+}

tests/integration/app_rollback_env_version.bats

@@ -24,9 +24,9 @@ teardown(){
 }
 
 @test "rollback writes version to env file" {
-  run $ABRA app deploy "$TEST_APP_DOMAIN" "0.2.0+1.21.0" --no-input --no-converge-checks
+  run $ABRA app deploy "$TEST_APP_DOMAIN" "0.2.0+1.21.0" \
+    --no-input --no-converge-checks
   assert_success
-  assert_output --partial "0.2.0+1.21.0"
 
   run grep -q "TYPE=abra-test-recipe:0.2.0+1.21.0" \
     "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
@@ -35,8 +35,6 @@ teardown(){
   run $ABRA app rollback "$TEST_APP_DOMAIN" "0.1.0+1.20.0" \
     --no-input --no-converge-checks --debug
   assert_success
-  assert_output --partial "0.1.0+1.20.0"
-  assert_output --partial "overriding env file version"
 
   run grep -q "TYPE=abra-test-recipe:0.1.0+1.20.0" \
     "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"

tests/integration/app_rollback_overview.bats

@@ -0,0 +1,102 @@
+#!/usr/bin/env bash
+
+setup_file(){
+  load "$PWD/tests/integration/helpers/common"
+  _common_setup
+  _add_server
+  _new_app
+}
+
+teardown_file(){
+  _rm_app
+  _rm_server
+  _reset_recipe
+}
+
+setup(){
+  load "$PWD/tests/integration/helpers/common"
+  _common_setup
+}
+
+teardown(){
+  _undeploy_app
+  _reset_app
+  _reset_recipe
+}
+
+@test "deploy then rollback" { 
+  run $ABRA app deploy "$TEST_APP_DOMAIN" "0.2.0+1.21.0" \
+    --no-input --no-converge-checks
+  assert_success
+
+  run $ABRA app rollback "$TEST_APP_DOMAIN" "0.1.0+1.20.0" \
+    --no-input --no-converge-checks
+  assert_success
+
+  # current deployment
+  assert_output --regexp 'VERSION.*' + "0.2.0+1.21.0" 
+  assert_output --regexp 'CHAOS.*false'
+
+  # rollback
+  assert_output --regexp 'VERSION.*' + "0.1.0+1.20.0" 
+
+  # env version
+  assert_output --regexp 'CURRENT VERSION.*' + "0.2.0+1.21.0"
+  assert_output --regexp 'NEW VERSION.*' + "0.1.0+1.20.0"
+
+  run grep -q "TYPE=$TEST_RECIPE:0.1.0+1.20.0" \
+    "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
+  assert_success
+}
+
+@test "force rollback" { 
+  run $ABRA app deploy "$TEST_APP_DOMAIN" "0.2.0+1.21.0" \
+    --no-input --no-converge-checks
+  assert_success
+
+  run $ABRA app rollback "$TEST_APP_DOMAIN" "0.2.0+1.21.0" \
+    --no-input --no-converge-checks --force
+  assert_success
+
+  # current deployment
+  assert_output --regexp 'VERSION.*' + "0.2.0+1.21.0" 
+  assert_output --regexp 'CHAOS.*false'
+
+  # rollback
+  assert_output --regexp 'VERSION.*' + "0.2.0+1.21.0"
+
+  # env version
+  assert_output --regexp 'CURRENT VERSION.*' + "0.2.0+1.21.0"
+  assert_output --regexp 'NEW VERSION.*' + "0.2.0+1.21.0"
+
+  run grep -q "TYPE=$TEST_RECIPE:0.2.0+1.21.0" \
+    "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
+  assert_success
+}
+
+@test "app rollback no .env version" {
+  run $ABRA app deploy "$TEST_APP_DOMAIN" "0.2.0+1.21.0" \
+    --no-input --no-converge-checks
+  assert_success
+
+  _wipe_env_version
+
+  run $ABRA app rollback "$TEST_APP_DOMAIN" "0.1.0+1.20.0" \
+    --no-input --no-converge-checks
+  assert_success
+
+  # current deployment
+  assert_output --regexp 'VERSION.*' + "0.2.0+1.21.0"
+  assert_output --regexp 'CHAOS.*false'
+
+  # rollback
+  assert_output --regexp 'VERSION.*' + "0.1.0+1.20.0"
+
+  # env version
+  assert_output --regexp 'CURRENT VERSION.*N/A'
+  assert_output --regexp 'NEW VERSION.*' + "0.2.0+1.21.0"
+
+  run grep -q "TYPE=$TEST_RECIPE:${latestRelease}" \
+    "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
+  assert_success
+}

tests/integration/app_secret.bats

@@ -41,6 +41,11 @@ teardown(){
 
   run $ABRA app secret generate "$TEST_APP_DOMAIN"
   assert_failure
+  assert_output --partial 'missing arguments'
+
+  run $ABRA app secret generate "$TEST_APP_DOMAIN" test_pass_one
+  assert_failure
+  assert_output --partial 'missing arguments'
 
   run $ABRA app secret generate "$TEST_APP_DOMAIN" testSecret testVersion --all
   assert_failure
@@ -131,6 +136,9 @@ teardown(){
   assert_failure
   assert_output --partial 'locally unstaged changes'
 
+  assert_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+  assert_equal "$(_git_status)" "?? foo"
+
   run rm -rf "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
   assert_not_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
 }
@@ -271,6 +279,9 @@ teardown(){
   assert_failure
   assert_output --partial 'locally unstaged changes'
 
+  assert_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+  assert_equal "$(_git_status)" "?? foo"
+
   run rm -rf "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
   assert_not_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
 }
@@ -319,6 +330,9 @@ teardown(){
   assert_failure
   assert_output --partial 'locally unstaged changes'
 
+  assert_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+  assert_equal "$(_git_status)" "?? foo"
+
   run rm -rf "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
   assert_not_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
 }

tests/integration/app_undeploy_overview.bats

@@ -0,0 +1,102 @@
+#!/usr/bin/env bash
+
+setup_file(){
+  load "$PWD/tests/integration/helpers/common"
+  _common_setup
+  _add_server
+  _new_app
+}
+
+teardown_file(){
+  _rm_app
+  _rm_server
+  _reset_recipe
+}
+
+setup(){
+  load "$PWD/tests/integration/helpers/common"
+  _common_setup
+  _ensure_catalogue
+}
+
+teardown(){
+  _reset_recipe
+  _undeploy_app
+  _reset_app
+}
+
+@test "deploy and undeploy" {
+  run $ABRA app deploy "$TEST_APP_DOMAIN" "0.1.0+1.20.0" \
+    --no-input --no-converge-checks
+  assert_success
+
+  run $ABRA app undeploy "$TEST_APP_DOMAIN" --no-input
+  assert_success
+
+  # current deployment
+  assert_output --regexp 'VERSION.*' + "0.1.0+1.20.0" 
+  assert_output --regexp 'CHAOS.*false'
+
+  # env version
+  assert_output --regexp 'CURRENT VERSION.*' + "0.1.0+1.20.0"
+  assert_output --regexp 'NEW VERSION.*' + "0.1.0+1.20.0"
+
+  run grep -q "TYPE=$TEST_RECIPE:0.1.0+1.20.0" \
+    "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
+  assert_success
+}
+
+@test "chaos deploy and undeploy" {
+  headHash=$(_get_head_hash)
+  latestRelease=$(_latest_release)
+
+  run $ABRA app deploy "$TEST_APP_DOMAIN" \
+    --no-input --no-converge-checks --chaos
+  assert_success
+
+  run $ABRA app undeploy "$TEST_APP_DOMAIN" --no-input
+  assert_success
+
+  # current deployment
+  assert_output --regexp 'VERSION.*' + "${latestRelease}"
+  assert_output --regexp 'CHAOS.*' + "${headHash:0:8}"
+
+  # env version
+  assert_output --regexp 'CURRENT VERSION.*' + "${latestRelease}"
+  assert_output --regexp 'NEW VERSION.*' + "${headHash:0:8}"
+
+  run grep -q "TYPE=$TEST_RECIPE:${headHash:0:8}" \
+    "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
+  assert_success
+}
+
+@test "chaos deploy with unstaged commits and undeploy" {
+  headHash=$(_get_head_hash)
+  latestRelease=$(_latest_release)
+
+  run bash -c 'echo "unstaged changes" >> "$ABRA_DIR/recipes/$TEST_RECIPE/foo"'
+  assert_success
+  assert_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+
+  run $ABRA app deploy "$TEST_APP_DOMAIN" \
+    --no-input --no-converge-checks --chaos
+  assert_success
+
+  run $ABRA app undeploy "$TEST_APP_DOMAIN" --no-input
+  assert_success
+
+  # current deployment
+  assert_output --regexp 'VERSION.*' + "${latestRelease}"
+  assert_output --regexp 'CHAOS.*' + "${headHash:0:8}+U"
+
+  # env version
+  assert_output --regexp 'CURRENT VERSION.*' + "${latestRelease}"
+  assert_output --regexp 'NEW VERSION.*' + "${headHash:0:8}+U"
+
+  run grep -q "TYPE=$TEST_RECIPE:${headHash:0:8}" \
+    "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
+  assert_success
+
+  run rm -rf "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+  assert_not_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
+}

tests/integration/app_upgrade.bats

@@ -33,6 +33,16 @@ teardown(){
   assert_failure
 }
 
+@test "retrieve recipe if missing" {
+  run rm -rf "$ABRA_DIR/recipes/$TEST_RECIPE"
+  assert_success
+  assert_not_exists "$ABRA_DIR/recipes/$TEST_RECIPE"
+
+  run $ABRA app upgrade "$TEST_APP_DOMAIN" --no-input --no-converge-checks
+  assert_failure
+  assert_exists "$ABRA_DIR/recipes/$TEST_RECIPE"
+}
+
 # bats test_tags=slow
 @test "error if specific version is not an upgrade" {
   run $ABRA app deploy "$TEST_APP_DOMAIN" "0.1.0+1.20.0" --no-input --no-converge-checks
@@ -118,6 +128,19 @@ teardown(){
   assert_output --partial '0.2.0+1.21.0'
 }
 
+@test "force upgrade with no available upgrades" {
+  run $ABRA app deploy "$TEST_APP_DOMAIN" \
+    --no-input --no-converge-checks
+  assert_success
+
+  latestRelease=$(_latest_release)
+
+  run $ABRA app upgrade "$TEST_APP_DOMAIN" \
+    --force --no-input --no-converge-checks
+  assert_success
+  assert_output --partial "$latestRelease"
+}
+
 # bats test_tags=slow
 @test "upgrade to latest" {
   run $ABRA app deploy "$TEST_APP_DOMAIN" "0.1.0+1.20.0" --no-input --no-converge-checks
@@ -216,3 +239,16 @@ teardown(){
   assert_failure
   assert_output --partial "not a known version"
 }
+
+# bats test_tags=slow
+@test "no chaos version label if no chaos" {
+  _deploy_app
+
+  run $ABRA app upgrade "$TEST_APP_DOMAIN" \
+    --no-input --no-converge-checks
+  assert_success
+
+  run $ABRA app labels "$TEST_APP_DOMAIN" --no-input
+  assert_success
+  refute_output --regexp "coop-cloud.abra-test-recipe.$TEST_SERVER.chaos-version"
+}

tests/integration/app_upgrade_env_version.bats

@@ -22,20 +22,19 @@ teardown(){
   _reset_recipe
 }
 
+# bats test_tags=slow
 @test "upgrade writes version to env file" {
-  run $ABRA app deploy "$TEST_APP_DOMAIN" "0.1.0+1.20.0" --no-input --no-converge-checks
+  run $ABRA app deploy "$TEST_APP_DOMAIN" "0.1.0+1.20.0" \
+    --no-input --no-converge-checks
   assert_success
-  assert_output --partial '0.1.0+1.20.0'
 
   run grep -q "TYPE=abra-test-recipe:0.1.0+1.20.0" \
     "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
   assert_success
 
   run $ABRA app upgrade "$TEST_APP_DOMAIN" "0.2.0+1.21.0" \
-    --no-input --no-converge-checks --debug
+    --no-input --no-converge-checks
   assert_success
-  assert_output --partial "0.2.0+1.21.0"
-  assert_output --partial "overriding env file version"
 
   run grep -q "TYPE=abra-test-recipe:0.2.0+1.21.0" \
     "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"

tests/integration/app_upgrade_overview.bats

@@ -0,0 +1,105 @@
+#!/usr/bin/env bash
+
+setup_file(){
+  load "$PWD/tests/integration/helpers/common"
+  _common_setup
+  _add_server
+  _new_app
+}
+
+teardown_file(){
+  _rm_app
+  _rm_server
+}
+
+setup(){
+  load "$PWD/tests/integration/helpers/common"
+  _common_setup
+}
+
+teardown(){
+  _undeploy_app
+  _reset_recipe
+}
+
+@test "deploy then upgrade" { 
+  run $ABRA app deploy "$TEST_APP_DOMAIN" "0.1.0+1.20.0" \
+    --no-input --no-converge-checks
+  assert_success
+
+  run $ABRA app upgrade "$TEST_APP_DOMAIN" "0.2.0+1.21.0" \
+    --no-input --no-converge-checks
+  assert_success
+
+  # current deployment
+  assert_output --regexp 'VERSION.*' + "0.1.0+1.20.0"
+  assert_output --regexp 'CHAOS.*false'
+
+  # upgrade
+  assert_output --regexp 'VERSION.*' + "0.2.0+1.21.0" 
+  assert_output --regexp 'CHAOS.*false'
+
+  # env version
+  assert_output --regexp 'CURRENT VERSION.*' + "0.1.0+1.20.0"
+  assert_output --regexp 'NEW VERSION.*' + "0.2.0+1.21.0"
+
+  run grep -q "TYPE=$TEST_RECIPE:0.2.0+1.21.0" \
+    "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
+  assert_success
+}
+
+@test "force upgrade" { 
+  run $ABRA app deploy "$TEST_APP_DOMAIN" "0.2.0+1.21.0" \
+    --no-input --no-converge-checks
+  assert_success
+
+  run $ABRA app upgrade "$TEST_APP_DOMAIN" "0.2.0+1.21.0" \
+    --no-input --no-converge-checks --force
+  assert_success
+
+  # current deployment
+  assert_output --regexp 'VERSION.*' + "0.2.0+1.21.0" 
+  assert_output --regexp 'CHAOS.*false'
+
+  # upgrade
+  assert_output --regexp 'VERSION.*' + "0.2.0+1.21.0"
+  assert_output --regexp 'CHAOS.*false'
+
+  # env version
+  assert_output --regexp 'CURRENT VERSION.*' + "0.2.0+1.21.0"
+  assert_output --regexp 'NEW VERSION.*' + "0.2.0+1.21.0"
+
+  run grep -q "TYPE=$TEST_RECIPE:0.2.0+1.21.0" \
+    "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
+  assert_success
+}
+
+@test "app upgrade no .env version" {
+  latestRelease=$(_latest_release)
+
+  run $ABRA app deploy "$TEST_APP_DOMAIN" "0.2.0+1.21.0" \
+    --no-input --no-converge-checks
+  assert_success
+
+  _wipe_env_version
+
+  run $ABRA app upgrade "$TEST_APP_DOMAIN" \
+    --no-input --no-converge-checks --force
+  assert_success
+
+  # current deployment
+  assert_output --regexp 'VERSION.*' + "0.2.0+1.21.0"
+  assert_output --regexp 'CHAOS.*false'
+
+  # upgrade
+  assert_output --regexp 'VERSION.*' + "0.2.0+1.21.0"
+  assert_output --regexp 'CHAOS.*false'
+
+  # env version
+  assert_output --regexp 'CURRENT VERSION.*N/A'
+  assert_output --regexp 'NEW VERSION.*' + "0.2.0+1.21.0"
+
+  run grep -q "TYPE=$TEST_RECIPE:${latestRelease}" \
+    "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
+  assert_success
+}