feat: msgctx support

See #647
See toolshed/xgettext-go#1

.gitignore

@@ -7,3 +7,4 @@
 /kadabra
 dist/
 tests/integration/.bats
+/bin

Makefile

@@ -78,14 +78,20 @@ update-po:
 	done
 
 .PHONY: update-pot
-update-pot:
+update-pot: ./bin/xgettext-go
-	@xgettext-go \
+	@./bin/xgettext-go \
 		-o pkg/i18n/locales/$(DOMAIN).pot \
 		--keyword=i18n.G \
+		--keyword-ctx=i18n.GC \
 		--sort-output \
 		--add-comments-tag="translators" \
 		$$(find . -name "*.go" -not -path "*vendor*" | sort)
 
+./bin/xgettext-go:
+	@mkdir -p ./bin && \
+	wget -O ./bin/xgettext-go https://git.coopcloud.tech/toolshed/xgettext-go/raw/branch/main/xgettext-go && \
+	chmod +x ./bin/xgettext-go
+
 .PHONY: update-pot-po-metadata
 update-pot-po-metadata:
 	@sed -i "s/charset=CHARSET/charset=UTF-8/g" pkg/i18n/locales/*.po pkg/i18n/locales/*.pot

cli/app/app.go

@@ -9,7 +9,7 @@ import (
 
 // translators: `abra app` aliases. use a comma separated list of aliases with
 // no spaces in between
-var appAliases = i18n.G("a")
+var appAliases = i18n.GC("a", "abra app")
 
 var AppCommand = &cobra.Command{
 	// translators: `app` command group

cli/app/backup.go

@@ -268,7 +268,7 @@ func init() {
 	AppBackupListCommand.Flags().BoolVarP(
 		&showAllPaths,
 		i18n.G("all"),
-		i18n.G("a"),
+		i18n.GC("a", "app backup"),
 		false,
 		i18n.G("show all paths"),
 	)

cli/app/deploy.go

@@ -3,7 +3,6 @@ package app
 import (
 	"context"
 	"errors"
-	"fmt"
 	"strings"
 
 	"coopcloud.tech/abra/cli/internal"
@@ -104,17 +103,18 @@ checkout as-is. Recipe commit hashes are also supported as values for
 
 		toDeployVersion, err = getDeployVersion(args, deployMeta, app)
 		if err != nil {
-			log.Fatal(err)
+			log.Fatal(i18n.G("get deploy version: %s", err))
 		}
 
+		versionIsChaos := false
 		if !internal.Chaos {
-			isChaosCommit, err := app.Recipe.EnsureVersion(toDeployVersion)
+			var err error
+			versionIsChaos, err = app.Recipe.EnsureVersion(toDeployVersion)
 			if err != nil {
 				log.Fatal(i18n.G("ensure recipe: %s", err))
 			}
-			if isChaosCommit {
+			if versionIsChaos {
 				log.Warnf(i18n.G("version '%s' appears to be a chaos commit, but --chaos/-C was not provided", toDeployVersion))
-				internal.Chaos = true
 			}
 		}
 
@@ -154,23 +154,12 @@ checkout as-is. Recipe commit hashes are also supported as values for
 
 		appPkg.ExposeAllEnv(stackName, compose, app.Env)
 		appPkg.SetRecipeLabel(compose, stackName, app.Recipe.Name)
-		appPkg.SetChaosLabel(compose, stackName, internal.Chaos)
+		appPkg.SetChaosLabel(compose, stackName, internal.Chaos || versionIsChaos)
 		if internal.Chaos {
 			appPkg.SetChaosVersionLabel(compose, stackName, toDeployVersion)
 		}
 		appPkg.SetUpdateLabel(compose, stackName, app.Env)
-
+		appPkg.SetVersionLabel(compose, stackName, toDeployVersion)
-		versionLabel := toDeployVersion
-		if internal.Chaos {
-			for _, service := range compose.Services {
-				if service.Name == "app" {
-					labelKey := fmt.Sprintf("coop-cloud.%s.version", stackName)
-					// NOTE(d1): keep non-chaos version labbeling when doing chaos ops
-					versionLabel = service.Deploy.Labels[labelKey]
-				}
-			}
-		}
-		appPkg.SetVersionLabel(compose, stackName, versionLabel)
 
 		envVars, err := appPkg.CheckEnv(app)
 		if err != nil {
@@ -200,9 +189,6 @@ checkout as-is. Recipe commit hashes are also supported as values for
 		deployedVersion := config.NO_VERSION_DEFAULT
 		if deployMeta.IsDeployed {
 			deployedVersion = deployMeta.Version
-			if deployMeta.IsChaos {
-				deployedVersion = deployMeta.ChaosVersion
-			}
 		}
 
 		// Gather secrets
@@ -348,12 +334,7 @@ func getDeployVersion(cliArgs []string, deployMeta stack.DeployMeta, app appPkg.
 	// Check if the recipe has a version in the .env file
 	if app.Recipe.EnvVersion != "" && !internal.DeployLatest {
 		if strings.HasSuffix(app.Recipe.EnvVersionRaw, "+U") {
-			// NOTE(d1): use double-line 5 spaces ("FATA ") trick to make a more
+			return "", errors.New(i18n.G("version: can not redeploy chaos version %s", app.Recipe.EnvVersionRaw))
-			// informative error message. it's ugly but that's our logging situation
-			// atm
-			return "", errors.New(i18n.G(`cannot redeploy previous chaos version (%s), did you mean to use "--chaos"?
-     to return to a regular release, specify a release tag, commit SHA or use "--latest"`,
-				formatter.BoldDirtyDefault(app.Recipe.EnvVersionRaw)))
 		}
 		log.Debug(i18n.G("version: taking version from .env file: %s", app.Recipe.EnvVersion))
 		return app.Recipe.EnvVersion, nil

cli/app/restart.go

@@ -166,7 +166,7 @@ func init() {
 	AppRestartCommand.Flags().BoolVarP(
 		&allServices,
 		i18n.G("all-services"),
-		i18n.G("a"),
+		i18n.GC("a", "app restart"),
 		false,
 		i18n.G("restart all services"),
 	)

cli/app/rollback.go

@@ -203,15 +203,10 @@ beforehand. See "abra app backup" for more.`),
 			log.Fatal(err)
 		}
 
-		deployedVersion := deployMeta.Version
-		if deployMeta.IsChaos {
-			deployedVersion = deployMeta.ChaosVersion
-		}
-
 		// NOTE(d1): no release notes implemeneted for rolling back
 		if err := internal.DeployOverview(
 			app,
-			deployedVersion,
+			deployMeta.Version,
 			chosenDowngrade,
 			"",
 			downgradeWarnMessages,

cli/app/secret.go

@@ -574,7 +574,7 @@ func init() {
 	AppSecretGenerateCommand.Flags().BoolVarP(
 		&generateAllSecrets,
 		i18n.G("all"),
-		i18n.G("a"),
+		i18n.GC("a", "app secret generate"),
 		false,
 		i18n.G("generate all secrets"),
 	)
@@ -614,7 +614,7 @@ func init() {
 	AppSecretRmCommand.Flags().BoolVarP(
 		&rmAllSecrets,
 		i18n.G("all"),
-		i18n.G("a"),
+		i18n.GC("a", "app secret rm"),
 		false,
 		i18n.G("remove all secrets"),
 	)

cli/app/undeploy.go

@@ -65,14 +65,9 @@ Passing "--prune/-p" does not remove those volumes.`),
 			log.Fatal(i18n.G("%s is not deployed?", app.Name))
 		}
 
-		version := deployMeta.Version
-		if deployMeta.IsChaos {
-			version = deployMeta.ChaosVersion
-		}
-
 		if err := internal.DeployOverview(
 			app,
-			version,
+			deployMeta.Version,
 			config.NO_DOMAIN_DEFAULT,
 			"",
 			nil,
@@ -115,7 +110,7 @@ Passing "--prune/-p" does not remove those volumes.`),
 
 		log.Info(i18n.G("undeploy succeeded 🟢"))
 
-		if err := app.WriteRecipeVersion(version, false); err != nil {
+		if err := app.WriteRecipeVersion(deployMeta.Version, false); err != nil {
 			log.Fatal(i18n.G("writing recipe version failed: %s", err))
 		}
 	},

cli/app/upgrade.go

@@ -241,14 +241,9 @@ beforehand. See "abra app backup" for more.`),
 			)
 		}
 
-		deployedVersion := deployMeta.Version
-		if deployMeta.IsChaos {
-			deployedVersion = deployMeta.ChaosVersion
-		}
-
 		if err := internal.DeployOverview(
 			app,
-			deployedVersion,
+			deployMeta.Version,
 			chosenUpgrade,
 			upgradeReleaseNotes,
 			upgradeWarnMessages,

cli/internal/deploy.go

@@ -143,37 +143,29 @@ func getDeployType(currentVersion, newVersion string) string {
 	if newVersion == config.NO_DOMAIN_DEFAULT {
 		return i18n.G("UNDEPLOY")
 	}
-
 	if strings.Contains(newVersion, "+U") {
 		return i18n.G("CHAOS DEPLOY")
 	}
-
 	if strings.Contains(currentVersion, "+U") {
 		return i18n.G("UNCHAOS DEPLOY")
 	}
-
 	if currentVersion == newVersion {
 		return ("REDEPLOY")
 	}
-
 	if currentVersion == config.NO_VERSION_DEFAULT {
 		return i18n.G("NEW DEPLOY")
 	}
-
 	currentParsed, err := tagcmp.Parse(currentVersion)
 	if err != nil {
 		return i18n.G("DEPLOY")
 	}
-
 	newParsed, err := tagcmp.Parse(newVersion)
 	if err != nil {
 		return i18n.G("DEPLOY")
 	}
-
 	if currentParsed.IsLessThan(newParsed) {
 		return i18n.G("UPGRADE")
 	}
-
 	return i18n.G("DOWNGRADE")
 }
 

cli/recipe/fetch.go

@@ -119,7 +119,7 @@ func init() {
 	RecipeFetchCommand.Flags().BoolVarP(
 		&fetchAllRecipes,
 		i18n.G("all"),
-		i18n.G("a"),
+		i18n.GC("a", "recipe fetch"),
 		false,
 		i18n.G("fetch all recipes"),
 	)

cli/recipe/upgrade.go

@@ -381,7 +381,7 @@ func init() {
 	RecipeUpgradeCommand.Flags().BoolVarP(
 		&allTags,
 		i18n.G("all-tags"),
-		i18n.G("a"),
+		i18n.GC("a", "recipe upgrade"),
 		false,
 		i18n.G("list all tags, not just upgrades"),
 	)

cli/server/add.go

@@ -20,7 +20,7 @@ import (
 
 // translators: `abra server add` aliases. use a comma separated list of
 // aliases with no spaces in between
-var serverAddAliases = i18n.G("a")
+var serverAddAliases = i18n.GC("a", "server add")
 
 var ServerAddCommand = &cobra.Command{
 	// translators: `server add` command

cli/server/prune.go

@@ -96,7 +96,7 @@ func init() {
 	ServerPruneCommand.Flags().BoolVarP(
 		&allFilter,
 		i18n.G("all"),
-		i18n.G("a"),
+		i18n.GC("a", "server prune"),
 		false,
 		i18n.G("remove all unused images"),
 	)

cli/updater/updater.go

@@ -551,7 +551,7 @@ func init() {
 	UpgradeCommand.Flags().BoolVarP(
 		&updateAll,
 		i18n.G("all"),
-		i18n.G("a"),
+		i18n.GC("a", "abra upgrade"),
 		false,
 		i18n.G("update all deployed apps"),
 	)

pkg/i18n/i18n.go

@@ -20,6 +20,7 @@ var (
 	Locale        = DefaultLocale
 	_, Mo         = LoadLocale()
 	G             = Mo.Get
+	GC            = Mo.GetC
 )
 
 func LoadLocale() (string, *gotext.Mo) {

pkg/i18n/locales/abra.pot

@@ -7,7 +7,7 @@
 msgid   ""
 msgstr  "Project-Id-Version: \n"
         "Report-Msgid-Bugs-To: EMAIL\n"
-        "POT-Creation-Date: 2025-09-29 19:58+0200\n"
+        "POT-Creation-Date: 2025-09-28 12:38+0200\n"
         "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
         "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
         "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -111,7 +111,7 @@ msgid   "  # run <cmd> with args/flags\n"
         "  abra app run 1312.net app --user nobody -- ls -lha"
 msgstr  ""
 
-#: ./cli/app/deploy.go:42
+#: ./cli/app/deploy.go:41
 msgid   "  # standard deployment\n"
         "  abra app deploy 1312.net\n"
         "\n"
@@ -226,7 +226,7 @@ msgstr  ""
 msgid   "%s does not exist for %s, use /bin/sh as fallback"
 msgstr  ""
 
-#: ./cli/app/cmd.go:114 ./cli/internal/deploy.go:249
+#: ./cli/app/cmd.go:114 ./cli/internal/deploy.go:241
 #, c-format
 msgid   "%s does not exist for %s?"
 msgstr  ""
@@ -311,7 +311,7 @@ msgstr  ""
 msgid   "%s inserted into pass store"
 msgstr  ""
 
-#: ./cli/app/deploy.go:102
+#: ./cli/app/deploy.go:101
 #, c-format
 msgid   "%s is already deployed"
 msgstr  ""
@@ -336,17 +336,17 @@ msgstr  ""
 msgid   "%s is missing the TYPE env var?"
 msgstr  ""
 
-#: ./cli/app/rollback.go:306 ./cli/app/rollback.go:310
+#: ./cli/app/rollback.go:301 ./cli/app/rollback.go:305
 #, c-format
 msgid   "%s is not a downgrade for %s?"
 msgstr  ""
 
-#: ./cli/app/upgrade.go:427 ./cli/app/upgrade.go:431
+#: ./cli/app/upgrade.go:422 ./cli/app/upgrade.go:426
 #, c-format
 msgid   "%s is not an upgrade for %s?"
 msgstr  ""
 
-#: ./cli/app/logs.go:65 ./cli/app/ps.go:62 ./cli/app/restart.go:100 ./cli/app/services.go:55 ./cli/app/undeploy.go:65 ./cli/app/upgrade.go:448 ./cli/updater/updater.go:260
+#: ./cli/app/logs.go:65 ./cli/app/ps.go:62 ./cli/app/restart.go:100 ./cli/app/services.go:55 ./cli/app/undeploy.go:65 ./cli/app/upgrade.go:443 ./cli/updater/updater.go:260
 #, c-format
 msgid   "%s is not deployed?"
 msgstr  ""
@@ -361,7 +361,7 @@ msgstr  ""
 msgid   "%s is still deployed. Run \"abra app undeploy %s\""
 msgstr  ""
 
-#: ./cli/app/deploy.go:183 ./cli/app/upgrade.go:209
+#: ./cli/app/deploy.go:172 ./cli/app/upgrade.go:209
 #, c-format
 msgid   "%s missing from %s.env"
 msgstr  ""
@@ -526,12 +526,12 @@ msgstr  ""
 msgid   "%s: waiting %d seconds before next retry"
 msgstr  ""
 
-#: ./cli/app/upgrade.go:422
+#: ./cli/app/upgrade.go:417
 #, c-format
 msgid   "'%s' is not a known version"
 msgstr  ""
 
-#: ./cli/app/rollback.go:301 ./cli/app/upgrade.go:417
+#: ./cli/app/rollback.go:296 ./cli/app/upgrade.go:412
 #, c-format
 msgid   "'%s' is not a known version for %s"
 msgstr  ""
@@ -602,7 +602,7 @@ msgstr  ""
 msgid   "Both local recipe and live deployment labels are shown."
 msgstr  ""
 
-#: ./cli/app/backup.go:319 ./cli/app/backup.go:335 ./cli/app/check.go:95 ./cli/app/cmd.go:285 ./cli/app/cp.go:385 ./cli/app/deploy.go:380 ./cli/app/labels.go:143 ./cli/app/new.go:377 ./cli/app/ps.go:213 ./cli/app/restart.go:162 ./cli/app/restore.go:138 ./cli/app/secret.go:569 ./cli/app/secret.go:609 ./cli/app/secret.go:633 ./cli/app/secret.go:641 ./cli/catalogue/catalogue.go:318 ./cli/recipe/lint.go:137 ./cli/updater/updater.go:538
+#: ./cli/app/backup.go:319 ./cli/app/backup.go:335 ./cli/app/check.go:95 ./cli/app/cmd.go:285 ./cli/app/cp.go:385 ./cli/app/deploy.go:361 ./cli/app/labels.go:143 ./cli/app/new.go:377 ./cli/app/ps.go:213 ./cli/app/restart.go:162 ./cli/app/restore.go:138 ./cli/app/secret.go:569 ./cli/app/secret.go:609 ./cli/app/secret.go:633 ./cli/app/secret.go:641 ./cli/catalogue/catalogue.go:318 ./cli/recipe/lint.go:137 ./cli/updater/updater.go:538
 msgid   "C"
 msgstr  ""
 
@@ -610,7 +610,7 @@ msgstr  ""
 msgid   "CHAOS"
 msgstr  ""
 
-#: ./cli/internal/deploy.go:148
+#: ./cli/internal/deploy.go:147
 msgid   "CHAOS DEPLOY"
 msgstr  ""
 
@@ -748,11 +748,11 @@ msgid   "Creates a new app from a default recipe.\n"
         "on your $PATH."
 msgstr  ""
 
-#: ./cli/app/deploy.go:396 ./cli/app/new.go:353 ./cli/app/rollback.go:358 ./cli/app/upgrade.go:468
+#: ./cli/app/deploy.go:377 ./cli/app/new.go:353 ./cli/app/rollback.go:353 ./cli/app/upgrade.go:463
 msgid   "D"
 msgstr  ""
 
-#: ./cli/internal/deploy.go:165 ./cli/internal/deploy.go:170
+#: ./cli/internal/deploy.go:160 ./cli/internal/deploy.go:164
 msgid   "DEPLOY"
 msgstr  ""
 
@@ -760,20 +760,20 @@ msgstr  ""
 msgid   "DEPLOYED LABELS"
 msgstr  ""
 
-#: ./cli/app/list.go:222 ./cli/internal/deploy.go:78 ./cli/internal/deploy.go:208
+#: ./cli/app/list.go:222 ./cli/internal/deploy.go:78 ./cli/internal/deploy.go:200
 msgid   "DOMAIN"
 msgstr  ""
 
-#: ./cli/internal/deploy.go:177
+#: ./cli/internal/deploy.go:169
 msgid   "DOWNGRADE"
 msgstr  ""
 
 #. translators: Short description for `app deploy` command
-#: ./cli/app/deploy.go:36
+#: ./cli/app/deploy.go:35
 msgid   "Deploy an app"
 msgstr  ""
 
-#: ./cli/app/deploy.go:37
+#: ./cli/app/deploy.go:36
 msgid   "Deploy an app.\n"
         "\n"
         "This command supports chaos operations. Use \"--chaos/-C\" to deploy your recipe\n"
@@ -988,7 +988,7 @@ msgstr  ""
 msgid   "List volumes associated with an app"
 msgstr  ""
 
-#: ./cli/internal/deploy.go:216
+#: ./cli/internal/deploy.go:208
 msgid   "MOVE OVERVIEW"
 msgstr  ""
 
@@ -1059,7 +1059,7 @@ msgstr  ""
 msgid   "NAME"
 msgstr  ""
 
-#: ./cli/internal/deploy.go:160
+#: ./cli/internal/deploy.go:156
 msgid   "NEW DEPLOY"
 msgstr  ""
 
@@ -1067,7 +1067,7 @@ msgstr  ""
 msgid   "NEW DEPLOYMENT"
 msgstr  ""
 
-#: ./cli/internal/deploy.go:211
+#: ./cli/internal/deploy.go:203
 msgid   "NEW SERVER"
 msgstr  ""
 
@@ -1087,7 +1087,7 @@ msgid   "Notify on new versions for deployed apps.\n"
         "Use \"--major/-m\" to include new major versions."
 msgstr  ""
 
-#: ./cli/internal/deploy.go:210
+#: ./cli/internal/deploy.go:202
 msgid   "OLD SERVER"
 msgstr  ""
 
@@ -1115,7 +1115,7 @@ msgstr  ""
 msgid   "README.md metadata filled in"
 msgstr  ""
 
-#: ./cli/app/list.go:222 ./cli/internal/deploy.go:79 ./cli/internal/deploy.go:209
+#: ./cli/app/list.go:222 ./cli/internal/deploy.go:79 ./cli/internal/deploy.go:201
 msgid   "RECIPE"
 msgstr  ""
 
@@ -1235,7 +1235,7 @@ msgstr  ""
 msgid   "S"
 msgstr  ""
 
-#: ./cli/internal/deploy.go:99 ./cli/internal/deploy.go:212
+#: ./cli/internal/deploy.go:99 ./cli/internal/deploy.go:204
 msgid   "SECRETS"
 msgstr  ""
 
@@ -1451,11 +1451,11 @@ msgid   "To load completions:\n"
         "  # and source this file from your PowerShell profile."
 msgstr  ""
 
-#: ./cli/app/deploy.go:420 ./cli/app/rollback.go:374 ./cli/app/upgrade.go:492
+#: ./cli/app/deploy.go:401 ./cli/app/rollback.go:369 ./cli/app/upgrade.go:487
 msgid   "U"
 msgstr  ""
 
-#: ./cli/internal/deploy.go:152
+#: ./cli/internal/deploy.go:150
 msgid   "UNCHAOS DEPLOY"
 msgstr  ""
 
@@ -1463,7 +1463,7 @@ msgstr  ""
 msgid   "UNDEPLOY"
 msgstr  ""
 
-#: ./cli/app/list.go:228 ./cli/internal/deploy.go:174
+#: ./cli/app/list.go:228 ./cli/internal/deploy.go:167
 msgid   "UPGRADE"
 msgstr  ""
 
@@ -1589,7 +1589,7 @@ msgstr  ""
 msgid   "VERSION"
 msgstr  ""
 
-#: ./cli/internal/deploy.go:213
+#: ./cli/internal/deploy.go:205
 msgid   "VOLUMES"
 msgstr  ""
 
@@ -1668,9 +1668,55 @@ msgstr  ""
 
 #. translators: `abra app` aliases. use a comma separated list of aliases with
 #. no spaces in between
+#: ./cli/app/app.go:12
+msgctxt "abra app"
+msgid   "a"
+msgstr  ""
+
+#: ./cli/app/backup.go:271
+msgctxt "app backup"
+msgid   "a"
+msgstr  ""
+
+#: ./cli/app/restart.go:169
+msgctxt "app restart"
+msgid   "a"
+msgstr  ""
+
+#: ./cli/app/secret.go:577
+msgctxt "app secret generate"
+msgid   "a"
+msgstr  ""
+
+#: ./cli/app/secret.go:617
+msgctxt "app secret rm"
+msgid   "a"
+msgstr  ""
+
+#: ./cli/recipe/fetch.go:122
+msgctxt "recipe fetch"
+msgid   "a"
+msgstr  ""
+
+#: ./cli/recipe/upgrade.go:384
+msgctxt "recipe upgrade"
+msgid   "a"
+msgstr  ""
+
 #. translators: `abra server add` aliases. use a comma separated list of
 #. aliases with no spaces in between
-#: ./cli/app/app.go:12 ./cli/app/backup.go:271 ./cli/app/restart.go:169 ./cli/app/secret.go:577 ./cli/app/secret.go:617 ./cli/recipe/fetch.go:122 ./cli/recipe/upgrade.go:384 ./cli/server/add.go:23 ./cli/server/prune.go:99 ./cli/updater/updater.go:554
+#: ./cli/server/add.go:23
+msgctxt "server add"
+msgid   "a"
+msgstr  ""
+
+#: ./cli/server/prune.go:99
+msgctxt "server prune"
+msgid   "a"
+msgstr  ""
+
+#: ./cli/updater/updater.go:554
+msgctxt "abra upgrade"
 msgid   "a"
 msgstr  ""
 
@@ -1805,7 +1851,7 @@ msgstr  ""
 msgid   "attempting to run %s"
 msgstr  ""
 
-#: ./cli/app/deploy.go:271 ./cli/app/upgrade.go:294
+#: ./cli/app/deploy.go:257 ./cli/app/upgrade.go:289
 #, c-format
 msgid   "attempting to run post deploy commands, saw: %s"
 msgstr  ""
@@ -1830,7 +1876,7 @@ msgstr  ""
 msgid   "autocomplete [bash|zsh|fish|powershell]"
 msgstr  ""
 
-#: ./cli/app/deploy.go:65 ./cli/app/logs.go:39 ./cli/app/rollback.go:64 ./cli/app/secret.go:49 ./cli/app/secret.go:191 ./cli/app/secret.go:360 ./cli/app/upgrade.go:63 ./pkg/autocomplete/autocomplete.go:18 ./pkg/autocomplete/autocomplete.go:33 ./pkg/autocomplete/autocomplete.go:44 ./pkg/autocomplete/autocomplete.go:50 ./pkg/autocomplete/autocomplete.go:70 ./pkg/autocomplete/autocomplete.go:88 ./pkg/autocomplete/autocomplete.go:104 ./pkg/autocomplete/autocomplete.go:110 ./pkg/autocomplete/autocomplete.go:125
+#: ./cli/app/deploy.go:64 ./cli/app/logs.go:39 ./cli/app/rollback.go:64 ./cli/app/secret.go:49 ./cli/app/secret.go:191 ./cli/app/secret.go:360 ./cli/app/upgrade.go:63 ./pkg/autocomplete/autocomplete.go:18 ./pkg/autocomplete/autocomplete.go:33 ./pkg/autocomplete/autocomplete.go:44 ./pkg/autocomplete/autocomplete.go:50 ./pkg/autocomplete/autocomplete.go:70 ./pkg/autocomplete/autocomplete.go:88 ./pkg/autocomplete/autocomplete.go:104 ./pkg/autocomplete/autocomplete.go:110 ./pkg/autocomplete/autocomplete.go:125
 #, c-format
 msgid   "autocomplete failed: %s"
 msgstr  ""
@@ -1895,7 +1941,7 @@ msgstr  ""
 #. no spaces in between
 #. translators: `abra app cp` aliases. use a comma separated list of aliases with
 #. no spaces in between
-#: ./cli/app/backup.go:148 ./cli/app/cp.go:30 ./cli/app/deploy.go:404 ./cli/app/rollback.go:366 ./cli/app/upgrade.go:476
+#: ./cli/app/backup.go:148 ./cli/app/cp.go:30 ./cli/app/deploy.go:385 ./cli/app/rollback.go:361 ./cli/app/upgrade.go:471
 msgid   "c"
 msgstr  ""
 
@@ -1903,6 +1949,11 @@ msgstr  ""
 msgid   "can not insert from file and read from stdin"
 msgstr  ""
 
+#: ./pkg/recipe/git.go:52
+#, c-format
+msgid   "can not redeploy chaos version (%s) without --chaos"
+msgstr  ""
+
 #: ./cli/recipe/upgrade.go:324
 #, c-format
 msgid   "can upgrade service: %s, image: %s, tag: %s ::"
@@ -1927,7 +1978,7 @@ msgstr  ""
 msgid   "can't separate key from value: %s (this variable is probably unset)"
 msgstr  ""
 
-#: ./cli/internal/deploy.go:237
+#: ./cli/internal/deploy.go:229
 msgid   "cancelled"
 msgstr  ""
 
@@ -1951,17 +2002,6 @@ msgstr  ""
 msgid   "cannot parse %s, invalid tag specified?"
 msgstr  ""
 
-#: ./pkg/recipe/git.go:52
-#, c-format
-msgid   "cannot redeploy previous chaos version (%s), did you mean to use \"--chaos\"?"
-msgstr  ""
-
-#: ./cli/app/deploy.go:354
-#, c-format
-msgid   "cannot redeploy previous chaos version (%s), did you mean to use \"--chaos\"?\n"
-        "     to return to a regular release, specify a release tag, commit SHA or use \"--latest\""
-msgstr  ""
-
 #: ./pkg/dns/dns.go:38 ./pkg/dns/dns.go:47
 #, c-format
 msgid   "cannot resolve ipv4 for %s?"
@@ -1975,7 +2015,7 @@ msgstr  ""
 msgid   "cannot use '[secret] [version]' and '--all' together"
 msgstr  ""
 
-#: ./cli/app/deploy.go:310
+#: ./cli/app/deploy.go:296
 msgid   "cannot use --chaos and --latest together"
 msgstr  ""
 
@@ -1999,11 +2039,11 @@ msgstr  ""
 msgid   "cannot use [service] and --all-services/-a together"
 msgstr  ""
 
-#: ./cli/app/deploy.go:302 ./cli/app/new.go:76
+#: ./cli/app/deploy.go:288 ./cli/app/new.go:76
 msgid   "cannot use [version] and --chaos together"
 msgstr  ""
 
-#: ./cli/app/deploy.go:306
+#: ./cli/app/deploy.go:292
 msgid   "cannot use [version] and --latest together"
 msgstr  ""
 
@@ -2035,7 +2075,7 @@ msgstr  ""
 msgid   "cfg"
 msgstr  ""
 
-#: ./cli/app/backup.go:318 ./cli/app/backup.go:334 ./cli/app/check.go:94 ./cli/app/cmd.go:284 ./cli/app/cp.go:384 ./cli/app/deploy.go:379 ./cli/app/labels.go:142 ./cli/app/new.go:376 ./cli/app/ps.go:212 ./cli/app/restart.go:161 ./cli/app/restore.go:137 ./cli/app/secret.go:568 ./cli/app/secret.go:608 ./cli/app/secret.go:632 ./cli/app/secret.go:640 ./cli/catalogue/catalogue.go:317 ./cli/recipe/lint.go:136 ./cli/updater/updater.go:537
+#: ./cli/app/backup.go:318 ./cli/app/backup.go:334 ./cli/app/check.go:94 ./cli/app/cmd.go:284 ./cli/app/cp.go:384 ./cli/app/deploy.go:360 ./cli/app/labels.go:142 ./cli/app/new.go:376 ./cli/app/ps.go:212 ./cli/app/restart.go:161 ./cli/app/restore.go:137 ./cli/app/secret.go:568 ./cli/app/secret.go:608 ./cli/app/secret.go:632 ./cli/app/secret.go:640 ./cli/catalogue/catalogue.go:317 ./cli/recipe/lint.go:136 ./cli/updater/updater.go:537
 msgid   "chaos"
 msgstr  ""
 
@@ -2048,7 +2088,7 @@ msgstr  ""
 msgid   "check for major updates"
 msgstr  ""
 
-#: ./cli/app/deploy.go:94 ./cli/app/undeploy.go:57 ./cli/app/upgrade.go:440
+#: ./cli/app/deploy.go:93 ./cli/app/undeploy.go:57 ./cli/app/upgrade.go:435
 #, c-format
 msgid   "checking whether %s is already deployed"
 msgstr  ""
@@ -2199,7 +2239,7 @@ msgstr  ""
 msgid   "considering %s config(s) for tag update"
 msgstr  ""
 
-#: ./cli/app/undeploy.go:140 ./cli/server/prune.go:53
+#: ./cli/app/undeploy.go:135 ./cli/server/prune.go:53
 #, c-format
 msgid   "containers pruned: %d; space reclaimed: %s"
 msgstr  ""
@@ -2330,7 +2370,7 @@ msgstr  ""
 msgid   "critical errors present in %s config"
 msgstr  ""
 
-#: ./cli/app/rollback.go:296
+#: ./cli/app/rollback.go:291
 #, c-format
 msgid   "current deployment '%s' is not a known version for %s"
 msgstr  ""
@@ -2351,7 +2391,7 @@ msgstr  ""
 #. no spaces in between
 #. translators: `abra recipe diff` aliases. use a comma separated list of aliases
 #. with no spaces in between
-#: ./cli/app/backup.go:73 ./cli/app/deploy.go:29 ./cli/recipe/diff.go:16 ./cli/updater/updater.go:491
+#: ./cli/app/backup.go:73 ./cli/app/deploy.go:28 ./cli/recipe/diff.go:16 ./cli/updater/updater.go:491
 msgid   "d"
 msgstr  ""
 
@@ -2370,7 +2410,7 @@ msgid   "deleted %s successfully from server"
 msgstr  ""
 
 #. translators: `app deploy` command
-#: ./cli/app/deploy.go:33
+#: ./cli/app/deploy.go:32
 msgid   "deploy <domain> [version] [flags]"
 msgstr  ""
 
@@ -2386,7 +2426,7 @@ msgstr  ""
 msgid   "deploy labels stanza present"
 msgstr  ""
 
-#: ./cli/app/deploy.go:414
+#: ./cli/app/deploy.go:395
 msgid   "deploy latest recipe version"
 msgstr  ""
 
@@ -2488,11 +2528,11 @@ msgstr  ""
 msgid   "dirty: %v, "
 msgstr  ""
 
-#: ./cli/app/deploy.go:406 ./cli/app/rollback.go:368 ./cli/app/upgrade.go:478
+#: ./cli/app/deploy.go:387 ./cli/app/rollback.go:363 ./cli/app/upgrade.go:473
 msgid   "disable converge logic checks"
 msgstr  ""
 
-#: ./cli/app/deploy.go:398 ./cli/app/rollback.go:360 ./cli/app/upgrade.go:470
+#: ./cli/app/deploy.go:379 ./cli/app/rollback.go:355 ./cli/app/upgrade.go:465
 msgid   "disable public DNS checks"
 msgstr  ""
 
@@ -2550,7 +2590,7 @@ msgstr  ""
 msgid   "download <domain> [flags]"
 msgstr  ""
 
-#: ./cli/internal/deploy.go:227
+#: ./cli/internal/deploy.go:219
 msgid   "dry run"
 msgstr  ""
 
@@ -2637,7 +2677,7 @@ msgstr  ""
 msgid   "ensure \"image: ...\" set on all services"
 msgstr  ""
 
-#: ./cli/app/deploy.go:113
+#: ./cli/app/deploy.go:114
 #, c-format
 msgid   "ensure recipe: %s"
 msgstr  ""
@@ -2730,7 +2770,7 @@ msgstr  ""
 
 #. translators: `abra recipe fetch` aliases. use a comma separated list of aliases
 #. with no spaces in between
-#: ./cli/app/deploy.go:388 ./cli/app/remove.go:163 ./cli/app/rollback.go:350 ./cli/app/secret.go:593 ./cli/app/upgrade.go:460 ./cli/app/volume.go:217 ./cli/recipe/fetch.go:20 ./cli/recipe/fetch.go:138
+#: ./cli/app/deploy.go:369 ./cli/app/remove.go:163 ./cli/app/rollback.go:345 ./cli/app/secret.go:593 ./cli/app/upgrade.go:455 ./cli/app/volume.go:217 ./cli/recipe/fetch.go:20 ./cli/recipe/fetch.go:138
 msgid   "f"
 msgstr  ""
 
@@ -2966,7 +3006,7 @@ msgstr  ""
 msgid   "for %s read env %s with value: %s from docker service"
 msgstr  ""
 
-#: ./cli/app/deploy.go:387 ./cli/app/remove.go:162 ./cli/app/rollback.go:349 ./cli/app/upgrade.go:459 ./cli/app/volume.go:216 ./cli/recipe/fetch.go:137
+#: ./cli/app/deploy.go:368 ./cli/app/remove.go:162 ./cli/app/rollback.go:344 ./cli/app/upgrade.go:454 ./cli/app/volume.go:216 ./cli/recipe/fetch.go:137
 msgid   "force"
 msgstr  ""
 
@@ -3025,6 +3065,11 @@ msgstr  ""
 msgid   "generated secrets %s shown again, please take note of them %s"
 msgstr  ""
 
+#: ./cli/app/deploy.go:106
+#, c-format
+msgid   "get deploy version: %s"
+msgstr  ""
+
 #: ./pkg/app/compose.go:81
 #, c-format
 msgid   "get label '%s'"
@@ -3180,11 +3225,11 @@ msgstr  ""
 msgid   "id: %s, "
 msgstr  ""
 
-#: ./cli/app/backup.go:321 ./cli/app/backup.go:337 ./cli/app/check.go:97 ./cli/app/cmd.go:287 ./cli/app/cp.go:387 ./cli/app/deploy.go:382 ./cli/app/labels.go:145 ./cli/app/new.go:379 ./cli/app/ps.go:215 ./cli/app/restart.go:164 ./cli/app/restore.go:140 ./cli/app/secret.go:571 ./cli/app/secret.go:611 ./cli/app/secret.go:635 ./cli/app/secret.go:643 ./cli/catalogue/catalogue.go:320 ./cli/recipe/lint.go:139 ./cli/updater/updater.go:540
+#: ./cli/app/backup.go:321 ./cli/app/backup.go:337 ./cli/app/check.go:97 ./cli/app/cmd.go:287 ./cli/app/cp.go:387 ./cli/app/deploy.go:363 ./cli/app/labels.go:145 ./cli/app/new.go:379 ./cli/app/ps.go:215 ./cli/app/restart.go:164 ./cli/app/restore.go:140 ./cli/app/secret.go:571 ./cli/app/secret.go:611 ./cli/app/secret.go:635 ./cli/app/secret.go:643 ./cli/catalogue/catalogue.go:320 ./cli/recipe/lint.go:139 ./cli/updater/updater.go:540
 msgid   "ignore uncommitted recipes changes"
 msgstr  ""
 
-#: ./cli/app/undeploy.go:155 ./cli/server/prune.go:74
+#: ./cli/app/undeploy.go:150 ./cli/server/prune.go:74
 #, c-format
 msgid   "images pruned: %d; space reclaimed: %s"
 msgstr  ""
@@ -3373,7 +3418,7 @@ msgstr  ""
 #. no spaces in between
 #. translators: `abra recipe lint` aliases. use a comma separated list of
 #. aliases with no spaces in between
-#: ./cli/app/cmd.go:261 ./cli/app/deploy.go:412 ./cli/app/logs.go:20 ./cli/recipe/lint.go:17 ./cli/server/add.go:207
+#: ./cli/app/cmd.go:261 ./cli/app/deploy.go:393 ./cli/app/logs.go:20 ./cli/recipe/lint.go:17 ./cli/server/add.go:207
 msgid   "l"
 msgstr  ""
 
@@ -3382,7 +3427,7 @@ msgstr  ""
 msgid   "labels <domain> [flags]"
 msgstr  ""
 
-#: ./cli/app/deploy.go:411 ./cli/app/list.go:183
+#: ./cli/app/deploy.go:392 ./cli/app/list.go:183
 msgid   "latest"
 msgstr  ""
 
@@ -3622,7 +3667,7 @@ msgstr  ""
 msgid   "network %q is declared as external, but it is not in the right scope: %q instead of \"swarm\""
 msgstr  ""
 
-#: ./cli/app/undeploy.go:147 ./cli/server/prune.go:60
+#: ./cli/app/undeploy.go:142 ./cli/server/prune.go:60
 #, c-format
 msgid   "networks pruned: %d"
 msgstr  ""
@@ -3845,11 +3890,11 @@ msgstr  ""
 msgid   "no volumes to remove"
 msgstr  ""
 
-#: ./cli/app/deploy.go:403 ./cli/app/rollback.go:365 ./cli/app/upgrade.go:475
+#: ./cli/app/deploy.go:384 ./cli/app/rollback.go:360 ./cli/app/upgrade.go:470
 msgid   "no-converge-checks"
 msgstr  ""
 
-#: ./cli/app/deploy.go:395 ./cli/app/rollback.go:357 ./cli/app/upgrade.go:467
+#: ./cli/app/deploy.go:376 ./cli/app/rollback.go:352 ./cli/app/upgrade.go:462
 msgid   "no-domain-checks"
 msgstr  ""
 
@@ -3861,7 +3906,7 @@ msgstr  ""
 msgid   "no-tty"
 msgstr  ""
 
-#: ./cli/internal/deploy.go:257
+#: ./cli/internal/deploy.go:249
 #, c-format
 msgid   "not enough arguments: %s"
 msgstr  ""
@@ -3914,7 +3959,7 @@ msgstr  ""
 msgid   "only show errors"
 msgstr  ""
 
-#: ./cli/app/upgrade.go:486
+#: ./cli/app/upgrade.go:481
 msgid   "only show release notes"
 msgstr  ""
 
@@ -3926,7 +3971,7 @@ msgstr  ""
 #. with no spaces in between
 #. translators: `abra server prune` aliases. use a comma separated list of
 #. aliases with no spaces in between
-#: ./cli/app/backup.go:295 ./cli/app/new.go:361 ./cli/app/ps.go:29 ./cli/app/secret.go:561 ./cli/app/secret.go:585 ./cli/app/secret.go:625 ./cli/app/undeploy.go:168 ./cli/catalogue/catalogue.go:294 ./cli/recipe/list.go:112 ./cli/recipe/release.go:672 ./cli/server/prune.go:18
+#: ./cli/app/backup.go:295 ./cli/app/new.go:361 ./cli/app/ps.go:29 ./cli/app/secret.go:561 ./cli/app/secret.go:585 ./cli/app/secret.go:625 ./cli/app/undeploy.go:163 ./cli/catalogue/catalogue.go:294 ./cli/recipe/list.go:112 ./cli/recipe/release.go:672 ./cli/server/prune.go:18
 msgid   "p"
 msgstr  ""
 
@@ -3945,22 +3990,22 @@ msgstr  ""
 msgid   "parsed following command arguments: %s"
 msgstr  ""
 
-#: ./cli/app/upgrade.go:343
+#: ./cli/app/upgrade.go:338
 #, c-format
 msgid   "parsing chosen upgrade version failed: %s"
 msgstr  ""
 
-#: ./cli/app/upgrade.go:387
+#: ./cli/app/upgrade.go:382
 #, c-format
 msgid   "parsing deployed version failed: %s"
 msgstr  ""
 
-#: ./cli/app/upgrade.go:348
+#: ./cli/app/upgrade.go:343
 #, c-format
 msgid   "parsing deployment version failed: %s"
 msgstr  ""
 
-#: ./cli/app/upgrade.go:354 ./cli/app/upgrade.go:393
+#: ./cli/app/upgrade.go:349 ./cli/app/upgrade.go:388
 #, c-format
 msgid   "parsing recipe version failed: %s"
 msgstr  ""
@@ -3985,7 +4030,7 @@ msgstr  ""
 msgid   "pattern"
 msgstr  ""
 
-#: ./cli/app/deploy.go:390 ./cli/app/remove.go:165 ./cli/app/rollback.go:352 ./cli/app/upgrade.go:462 ./cli/app/volume.go:219
+#: ./cli/app/deploy.go:371 ./cli/app/remove.go:165 ./cli/app/rollback.go:347 ./cli/app/upgrade.go:457 ./cli/app/volume.go:219
 msgid   "perform action without further prompt"
 msgstr  ""
 
@@ -3994,22 +4039,22 @@ msgstr  ""
 msgid   "please fix your synced label for %s and re-run this command"
 msgstr  ""
 
-#: ./cli/app/rollback.go:264
+#: ./cli/app/rollback.go:259
 #, c-format
 msgid   "please select a downgrade (version: %s):"
 msgstr  ""
 
-#: ./cli/app/rollback.go:269
+#: ./cli/app/rollback.go:264
 #, c-format
 msgid   "please select a downgrade (version: %s, chaos: %s):"
 msgstr  ""
 
-#: ./cli/app/upgrade.go:310
+#: ./cli/app/upgrade.go:305
 #, c-format
 msgid   "please select an upgrade (version: %s):"
 msgstr  ""
 
-#: ./cli/app/upgrade.go:315
+#: ./cli/app/upgrade.go:310
 #, c-format
 msgid   "please select an upgrade (version: %s, chaos: %s):"
 msgstr  ""
@@ -4034,7 +4079,7 @@ msgstr  ""
 msgid   "print machine-readable output"
 msgstr  ""
 
-#: ./cli/internal/deploy.go:231
+#: ./cli/internal/deploy.go:223
 msgid   "proceed?"
 msgstr  ""
 
@@ -4048,7 +4093,7 @@ msgstr  ""
 msgid   "proposed images: %v"
 msgstr  ""
 
-#: ./cli/app/undeploy.go:167
+#: ./cli/app/undeploy.go:162
 msgid   "prune"
 msgstr  ""
 
@@ -4057,7 +4102,7 @@ msgstr  ""
 msgid   "prune <server> [flags]"
 msgstr  ""
 
-#: ./cli/app/undeploy.go:170
+#: ./cli/app/undeploy.go:165
 msgid   "prune unused containers, networks, and dangling images"
 msgstr  ""
 
@@ -4090,7 +4135,7 @@ msgstr  ""
 #. with no spaces in between
 #. translators: `abra recipe` aliases. use a comma separated list of aliases
 #. with no spaces in between
-#: ./cli/app/backup.go:327 ./cli/app/list.go:303 ./cli/app/move.go:346 ./cli/app/run.go:23 ./cli/app/upgrade.go:484 ./cli/catalogue/catalogue.go:302 ./cli/recipe/recipe.go:12 ./cli/recipe/release.go:640 ./cli/recipe/sync.go:270
+#: ./cli/app/backup.go:327 ./cli/app/list.go:303 ./cli/app/move.go:346 ./cli/app/run.go:23 ./cli/app/upgrade.go:479 ./cli/catalogue/catalogue.go:302 ./cli/recipe/recipe.go:12 ./cli/recipe/release.go:640 ./cli/recipe/sync.go:270
 msgid   "r"
 msgstr  ""
 
@@ -4206,7 +4251,7 @@ msgstr  ""
 msgid   "release <recipe> [version] [flags]"
 msgstr  ""
 
-#: ./cli/app/upgrade.go:483
+#: ./cli/app/upgrade.go:478
 msgid   "releasenotes"
 msgstr  ""
 
@@ -4510,7 +4555,7 @@ msgstr  ""
 msgid   "run command locally"
 msgstr  ""
 
-#: ./cli/app/deploy.go:269 ./cli/app/upgrade.go:291
+#: ./cli/app/deploy.go:255 ./cli/app/upgrade.go:286
 #, c-format
 msgid   "run the following post-deploy commands: %s"
 msgstr  ""
@@ -4520,7 +4565,7 @@ msgstr  ""
 msgid   "running backup %s on %s with exec config %v"
 msgstr  ""
 
-#: ./cli/internal/deploy.go:287
+#: ./cli/internal/deploy.go:279
 #, c-format
 msgid   "running command %s %s within the context of %s_%s"
 msgstr  ""
@@ -4540,7 +4585,7 @@ msgstr  ""
 msgid   "running command: %s"
 msgstr  ""
 
-#: ./cli/internal/deploy.go:265
+#: ./cli/internal/deploy.go:257
 #, c-format
 msgid   "running post-command '%s %s' in container %s"
 msgstr  ""
@@ -4595,7 +4640,7 @@ msgstr  ""
 msgid   "secret not found: %s"
 msgstr  ""
 
-#: ./cli/app/deploy.go:324
+#: ./cli/app/deploy.go:310
 #, c-format
 msgid   "secret not generated: %s"
 msgstr  ""
@@ -4715,7 +4760,7 @@ msgstr  ""
 msgid   "severity"
 msgstr  ""
 
-#: ./cli/app/deploy.go:422 ./cli/app/rollback.go:376 ./cli/app/upgrade.go:494
+#: ./cli/app/deploy.go:403 ./cli/app/rollback.go:371 ./cli/app/upgrade.go:489
 msgid   "show all configs & images, including unchanged ones"
 msgstr  ""
 
@@ -4739,7 +4784,7 @@ msgstr  ""
 msgid   "show debug messages"
 msgstr  ""
 
-#: ./cli/app/deploy.go:419 ./cli/app/rollback.go:373 ./cli/app/upgrade.go:491
+#: ./cli/app/deploy.go:400 ./cli/app/rollback.go:368 ./cli/app/upgrade.go:486
 msgid   "show-unchanged"
 msgstr  ""
 
@@ -4787,11 +4832,11 @@ msgstr  ""
 msgid   "skipping converge logic checks"
 msgstr  ""
 
-#: ./cli/app/deploy.go:197
+#: ./cli/app/deploy.go:186
 msgid   "skipping domain checks"
 msgstr  ""
 
-#: ./cli/app/deploy.go:194
+#: ./cli/app/deploy.go:183
 msgid   "skipping domain checks, no DOMAIN=... configured"
 msgstr  ""
 
@@ -5313,7 +5358,7 @@ msgstr  ""
 msgid   "undeploy <domain> [flags]"
 msgstr  ""
 
-#: ./cli/app/undeploy.go:116
+#: ./cli/app/undeploy.go:111
 msgid   "undeploy succeeded 🟢"
 msgstr  ""
 
@@ -5512,7 +5557,7 @@ msgstr  ""
 msgid   "version %s saved to %s.env"
 msgstr  ""
 
-#: ./cli/app/deploy.go:116
+#: ./cli/app/deploy.go:117
 #, c-format
 msgid   "version '%s' appears to be a chaos commit, but --chaos/-C was not provided"
 msgstr  ""
@@ -5536,27 +5581,32 @@ msgstr  ""
 msgid   "version wiped from %s.env"
 msgstr  ""
 
-#: ./cli/app/deploy.go:338
+#: ./cli/app/deploy.go:337
+#, c-format
+msgid   "version: can not redeploy chaos version %s"
+msgstr  ""
+
+#: ./cli/app/deploy.go:324
 #, c-format
 msgid   "version: taking chaos version: %s"
 msgstr  ""
 
-#: ./cli/app/deploy.go:364
+#: ./cli/app/deploy.go:345
 #, c-format
 msgid   "version: taking deployed version: %s"
 msgstr  ""
 
-#: ./cli/app/deploy.go:369
+#: ./cli/app/deploy.go:350
 #, c-format
 msgid   "version: taking new recipe version: %s"
 msgstr  ""
 
-#: ./cli/app/deploy.go:358
+#: ./cli/app/deploy.go:339
 #, c-format
 msgid   "version: taking version from .env file: %s"
 msgstr  ""
 
-#: ./cli/app/deploy.go:344
+#: ./cli/app/deploy.go:330
 #, c-format
 msgid   "version: taking version from cli arg: %s"
 msgstr  ""
@@ -5679,7 +5729,7 @@ msgstr  ""
 msgid   "writer: %v, "
 msgstr  ""
 
-#: ./cli/app/deploy.go:276 ./cli/app/new.go:221 ./cli/app/rollback.go:253 ./cli/app/undeploy.go:119 ./cli/app/upgrade.go:299
+#: ./cli/app/deploy.go:262 ./cli/app/new.go:221 ./cli/app/rollback.go:248 ./cli/app/undeploy.go:114 ./cli/app/upgrade.go:294
 #, c-format
 msgid   "writing recipe version failed: %s"
 msgstr  ""

pkg/i18n/locales/es.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: EMAIL\n"
-"POT-Creation-Date: 2025-09-29 19:58+0200\n"
+"POT-Creation-Date: 2025-09-28 12:38+0200\n"
 "PO-Revision-Date: 2025-09-04 08:14+0000\n"
 "Last-Translator: chasqui <chasqui@cryptolab.net>\n"
 "Language-Team: Spanish <https://translate.coopcloud.tech/projects/co-op-"
@@ -119,7 +119,7 @@ msgid ""
 "  abra app run 1312.net app --user nobody -- ls -lha"
 msgstr ""
 
-#: cli/app/deploy.go:42
+#: cli/app/deploy.go:41
 msgid ""
 "  # standard deployment\n"
 "  abra app deploy 1312.net\n"
@@ -237,7 +237,7 @@ msgstr ""
 msgid "%s does not exist for %s, use /bin/sh as fallback"
 msgstr ""
 
-#: cli/app/cmd.go:114 cli/internal/deploy.go:249
+#: cli/app/cmd.go:114 cli/internal/deploy.go:241
 #, c-format
 msgid "%s does not exist for %s?"
 msgstr ""
@@ -324,7 +324,7 @@ msgstr ""
 msgid "%s inserted into pass store"
 msgstr ""
 
-#: cli/app/deploy.go:102
+#: cli/app/deploy.go:101
 #, c-format
 msgid "%s is already deployed"
 msgstr ""
@@ -349,18 +349,18 @@ msgstr ""
 msgid "%s is missing the TYPE env var?"
 msgstr ""
 
-#: cli/app/rollback.go:306 cli/app/rollback.go:310
+#: cli/app/rollback.go:301 cli/app/rollback.go:305
 #, c-format
 msgid "%s is not a downgrade for %s?"
 msgstr ""
 
-#: cli/app/upgrade.go:427 cli/app/upgrade.go:431
+#: cli/app/upgrade.go:422 cli/app/upgrade.go:426
 #, c-format
 msgid "%s is not an upgrade for %s?"
 msgstr ""
 
 #: cli/app/logs.go:65 cli/app/ps.go:62 cli/app/restart.go:100
-#: cli/app/services.go:55 cli/app/undeploy.go:65 cli/app/upgrade.go:448
+#: cli/app/services.go:55 cli/app/undeploy.go:65 cli/app/upgrade.go:443
 #: cli/updater/updater.go:260
 #, c-format
 msgid "%s is not deployed?"
@@ -376,7 +376,7 @@ msgstr ""
 msgid "%s is still deployed. Run \"abra app undeploy %s\""
 msgstr ""
 
-#: cli/app/deploy.go:183 cli/app/upgrade.go:209
+#: cli/app/deploy.go:172 cli/app/upgrade.go:209
 #, c-format
 msgid "%s missing from %s.env"
 msgstr ""
@@ -543,12 +543,12 @@ msgstr ""
 msgid "%s: waiting %d seconds before next retry"
 msgstr ""
 
-#: cli/app/upgrade.go:422
+#: cli/app/upgrade.go:417
 #, c-format
 msgid "'%s' is not a known version"
 msgstr ""
 
-#: cli/app/rollback.go:301 cli/app/upgrade.go:417
+#: cli/app/rollback.go:296 cli/app/upgrade.go:412
 #, c-format
 msgid "'%s' is not a known version for %s"
 msgstr ""
@@ -630,7 +630,7 @@ msgid "Both local recipe and live deployment labels are shown."
 msgstr ""
 
 #: cli/app/backup.go:319 cli/app/backup.go:335 cli/app/check.go:95
-#: cli/app/cmd.go:285 cli/app/cp.go:385 cli/app/deploy.go:380
+#: cli/app/cmd.go:285 cli/app/cp.go:385 cli/app/deploy.go:361
 #: cli/app/labels.go:143 cli/app/new.go:377 cli/app/ps.go:213
 #: cli/app/restart.go:162 cli/app/restore.go:138 cli/app/secret.go:569
 #: cli/app/secret.go:609 cli/app/secret.go:633 cli/app/secret.go:641
@@ -643,7 +643,7 @@ msgstr ""
 msgid "CHAOS"
 msgstr ""
 
-#: cli/internal/deploy.go:148
+#: cli/internal/deploy.go:147
 msgid "CHAOS DEPLOY"
 msgstr ""
 
@@ -801,12 +801,12 @@ msgid ""
 "on your $PATH."
 msgstr ""
 
-#: cli/app/deploy.go:396 cli/app/new.go:353 cli/app/rollback.go:358
+#: cli/app/deploy.go:377 cli/app/new.go:353 cli/app/rollback.go:353
-#: cli/app/upgrade.go:468
+#: cli/app/upgrade.go:463
 msgid "D"
 msgstr ""
 
-#: cli/internal/deploy.go:165 cli/internal/deploy.go:170
+#: cli/internal/deploy.go:160 cli/internal/deploy.go:164
 msgid "DEPLOY"
 msgstr ""
 
@@ -814,20 +814,20 @@ msgstr ""
 msgid "DEPLOYED LABELS"
 msgstr ""
 
-#: cli/app/list.go:222 cli/internal/deploy.go:78 cli/internal/deploy.go:208
+#: cli/app/list.go:222 cli/internal/deploy.go:78 cli/internal/deploy.go:200
 msgid "DOMAIN"
 msgstr ""
 
-#: cli/internal/deploy.go:177
+#: cli/internal/deploy.go:169
 msgid "DOWNGRADE"
 msgstr ""
 
 #. translators: Short description for `app deploy` command
-#: cli/app/deploy.go:36
+#: cli/app/deploy.go:35
 msgid "Deploy an app"
 msgstr "📤 Despliega una plataforma 🚀"
 
-#: cli/app/deploy.go:37
+#: cli/app/deploy.go:36
 msgid ""
 "Deploy an app.\n"
 "\n"
@@ -1058,7 +1058,7 @@ msgstr "📋 Listar los contenidos de una captura o instantánea 📸"
 msgid "List volumes associated with an app"
 msgstr "📋 Listar volúmenes 📦 asociados a una plataforma 🚀"
 
-#: cli/internal/deploy.go:216
+#: cli/internal/deploy.go:208
 msgid "MOVE OVERVIEW"
 msgstr ""
 
@@ -1136,7 +1136,7 @@ msgstr ""
 msgid "NAME"
 msgstr ""
 
-#: cli/internal/deploy.go:160
+#: cli/internal/deploy.go:156
 msgid "NEW DEPLOY"
 msgstr ""
 
@@ -1144,7 +1144,7 @@ msgstr ""
 msgid "NEW DEPLOYMENT"
 msgstr ""
 
-#: cli/internal/deploy.go:211
+#: cli/internal/deploy.go:203
 msgid "NEW SERVER"
 msgstr ""
 
@@ -1165,7 +1165,7 @@ msgid ""
 "Use \"--major/-m\" to include new major versions."
 msgstr ""
 
-#: cli/internal/deploy.go:210
+#: cli/internal/deploy.go:202
 msgid "OLD SERVER"
 msgstr ""
 
@@ -1195,7 +1195,7 @@ msgstr ""
 msgid "README.md metadata filled in"
 msgstr ""
 
-#: cli/app/list.go:222 cli/internal/deploy.go:79 cli/internal/deploy.go:209
+#: cli/app/list.go:222 cli/internal/deploy.go:79 cli/internal/deploy.go:201
 msgid "RECIPE"
 msgstr ""
 
@@ -1335,7 +1335,7 @@ msgstr "💻 Ejecutar comandos en una plataforma 🚀"
 msgid "S"
 msgstr ""
 
-#: cli/internal/deploy.go:99 cli/internal/deploy.go:212
+#: cli/internal/deploy.go:99 cli/internal/deploy.go:204
 msgid "SECRETS"
 msgstr ""
 
@@ -1569,11 +1569,11 @@ msgid ""
 "  # and source this file from your PowerShell profile."
 msgstr ""
 
-#: cli/app/deploy.go:420 cli/app/rollback.go:374 cli/app/upgrade.go:492
+#: cli/app/deploy.go:401 cli/app/rollback.go:369 cli/app/upgrade.go:487
 msgid "U"
 msgstr ""
 
-#: cli/internal/deploy.go:152
+#: cli/internal/deploy.go:150
 msgid "UNCHAOS DEPLOY"
 msgstr ""
 
@@ -1581,7 +1581,7 @@ msgstr ""
 msgid "UNDEPLOY"
 msgstr ""
 
-#: cli/app/list.go:228 cli/internal/deploy.go:174
+#: cli/app/list.go:228 cli/internal/deploy.go:167
 msgid "UPGRADE"
 msgstr ""
 
@@ -1734,7 +1734,7 @@ msgstr ""
 msgid "VERSION"
 msgstr ""
 
-#: cli/internal/deploy.go:213
+#: cli/internal/deploy.go:205
 msgid "VOLUMES"
 msgstr ""
 
@@ -1829,12 +1829,55 @@ msgstr ""
 
 #. translators: `abra app` aliases. use a comma separated list of aliases with
 #. no spaces in between
+#: cli/app/app.go:12
+msgctxt "abra app"
+msgid "a"
+msgstr ""
+
+#: cli/app/backup.go:271
+msgctxt "app backup"
+msgid "a"
+msgstr ""
+
+#: cli/app/restart.go:169
+msgctxt "app restart"
+msgid "a"
+msgstr ""
+
+#: cli/app/secret.go:577
+msgctxt "app secret generate"
+msgid "a"
+msgstr ""
+
+#: cli/app/secret.go:617
+msgctxt "app secret rm"
+msgid "a"
+msgstr ""
+
+#: cli/recipe/fetch.go:122
+msgctxt "recipe fetch"
+msgid "a"
+msgstr ""
+
+#: cli/recipe/upgrade.go:384
+msgctxt "recipe upgrade"
+msgid "a"
+msgstr ""
+
 #. translators: `abra server add` aliases. use a comma separated list of
 #. aliases with no spaces in between
-#: cli/app/app.go:12 cli/app/backup.go:271 cli/app/restart.go:169
+#: cli/server/add.go:23
-#: cli/app/secret.go:577 cli/app/secret.go:617 cli/recipe/fetch.go:122
+msgctxt "server add"
-#: cli/recipe/upgrade.go:384 cli/server/add.go:23 cli/server/prune.go:99
+msgid "a"
+msgstr ""
+
+#: cli/server/prune.go:99
+msgctxt "server prune"
+msgid "a"
+msgstr ""
+
 #: cli/updater/updater.go:554
+msgctxt "abra upgrade"
 msgid "a"
 msgstr ""
 
@@ -1970,7 +2013,7 @@ msgstr ""
 msgid "attempting to run %s"
 msgstr ""
 
-#: cli/app/deploy.go:271 cli/app/upgrade.go:294
+#: cli/app/deploy.go:257 cli/app/upgrade.go:289
 #, c-format
 msgid "attempting to run post deploy commands, saw: %s"
 msgstr ""
@@ -1995,7 +2038,7 @@ msgstr ""
 msgid "autocomplete [bash|zsh|fish|powershell]"
 msgstr "autocompletar [bash|zsh|fish|powershell]"
 
-#: cli/app/deploy.go:65 cli/app/logs.go:39 cli/app/rollback.go:64
+#: cli/app/deploy.go:64 cli/app/logs.go:39 cli/app/rollback.go:64
 #: cli/app/secret.go:49 cli/app/secret.go:191 cli/app/secret.go:360
 #: cli/app/upgrade.go:63 pkg/autocomplete/autocomplete.go:18
 #: pkg/autocomplete/autocomplete.go:33 pkg/autocomplete/autocomplete.go:44
@@ -2066,8 +2109,8 @@ msgstr ""
 #. no spaces in between
 #. translators: `abra app cp` aliases. use a comma separated list of aliases with
 #. no spaces in between
-#: cli/app/backup.go:148 cli/app/cp.go:30 cli/app/deploy.go:404
+#: cli/app/backup.go:148 cli/app/cp.go:30 cli/app/deploy.go:385
-#: cli/app/rollback.go:366 cli/app/upgrade.go:476
+#: cli/app/rollback.go:361 cli/app/upgrade.go:471
 msgid "c"
 msgstr ""
 
@@ -2075,6 +2118,11 @@ msgstr ""
 msgid "can not insert from file and read from stdin"
 msgstr ""
 
+#: pkg/recipe/git.go:52
+#, c-format
+msgid "can not redeploy chaos version (%s) without --chaos"
+msgstr ""
+
 #: cli/recipe/upgrade.go:324
 #, c-format
 msgid "can upgrade service: %s, image: %s, tag: %s ::"
@@ -2099,7 +2147,7 @@ msgstr ""
 msgid "can't separate key from value: %s (this variable is probably unset)"
 msgstr ""
 
-#: cli/internal/deploy.go:237
+#: cli/internal/deploy.go:229
 msgid "cancelled"
 msgstr ""
 
@@ -2123,21 +2171,6 @@ msgstr ""
 msgid "cannot parse %s, invalid tag specified?"
 msgstr ""
 
-#: pkg/recipe/git.go:52
-#, c-format
-msgid ""
-"cannot redeploy previous chaos version (%s), did you mean to use \"--chaos\"?"
-msgstr ""
-
-#: cli/app/deploy.go:354
-#, c-format
-msgid ""
-"cannot redeploy previous chaos version (%s), did you mean to use \"--"
-"chaos\"?\n"
-"     to return to a regular release, specify a release tag, commit SHA or "
-"use \"--latest\""
-msgstr ""
-
 #: pkg/dns/dns.go:38 pkg/dns/dns.go:47
 #, c-format
 msgid "cannot resolve ipv4 for %s?"
@@ -2151,7 +2184,7 @@ msgstr ""
 msgid "cannot use '[secret] [version]' and '--all' together"
 msgstr ""
 
-#: cli/app/deploy.go:310
+#: cli/app/deploy.go:296
 msgid "cannot use --chaos and --latest together"
 msgstr ""
 
@@ -2175,11 +2208,11 @@ msgstr ""
 msgid "cannot use [service] and --all-services/-a together"
 msgstr ""
 
-#: cli/app/deploy.go:302 cli/app/new.go:76
+#: cli/app/deploy.go:288 cli/app/new.go:76
 msgid "cannot use [version] and --chaos together"
 msgstr ""
 
-#: cli/app/deploy.go:306
+#: cli/app/deploy.go:292
 msgid "cannot use [version] and --latest together"
 msgstr ""
 
@@ -2212,7 +2245,7 @@ msgid "cfg"
 msgstr ""
 
 #: cli/app/backup.go:318 cli/app/backup.go:334 cli/app/check.go:94
-#: cli/app/cmd.go:284 cli/app/cp.go:384 cli/app/deploy.go:379
+#: cli/app/cmd.go:284 cli/app/cp.go:384 cli/app/deploy.go:360
 #: cli/app/labels.go:142 cli/app/new.go:376 cli/app/ps.go:212
 #: cli/app/restart.go:161 cli/app/restore.go:137 cli/app/secret.go:568
 #: cli/app/secret.go:608 cli/app/secret.go:632 cli/app/secret.go:640
@@ -2230,7 +2263,7 @@ msgstr "verificar <domain> [flags]"
 msgid "check for major updates"
 msgstr ""
 
-#: cli/app/deploy.go:94 cli/app/undeploy.go:57 cli/app/upgrade.go:440
+#: cli/app/deploy.go:93 cli/app/undeploy.go:57 cli/app/upgrade.go:435
 #, c-format
 msgid "checking whether %s is already deployed"
 msgstr ""
@@ -2387,7 +2420,7 @@ msgstr ""
 msgid "considering %s config(s) for tag update"
 msgstr ""
 
-#: cli/app/undeploy.go:140 cli/server/prune.go:53
+#: cli/app/undeploy.go:135 cli/server/prune.go:53
 #, c-format
 msgid "containers pruned: %d; space reclaimed: %s"
 msgstr ""
@@ -2518,7 +2551,7 @@ msgstr ""
 msgid "critical errors present in %s config"
 msgstr ""
 
-#: cli/app/rollback.go:296
+#: cli/app/rollback.go:291
 #, c-format
 msgid "current deployment '%s' is not a known version for %s"
 msgstr ""
@@ -2539,7 +2572,7 @@ msgstr ""
 #. no spaces in between
 #. translators: `abra recipe diff` aliases. use a comma separated list of aliases
 #. with no spaces in between
-#: cli/app/backup.go:73 cli/app/deploy.go:29 cli/recipe/diff.go:16
+#: cli/app/backup.go:73 cli/app/deploy.go:28 cli/recipe/diff.go:16
 #: cli/updater/updater.go:491
 msgid "d"
 msgstr ""
@@ -2559,7 +2592,7 @@ msgid "deleted %s successfully from server"
 msgstr ""
 
 #. translators: `app deploy` command
-#: cli/app/deploy.go:33
+#: cli/app/deploy.go:32
 msgid "deploy <domain> [version] [flags]"
 msgstr "desplegar <domain> [version] [flags]"
 
@@ -2575,7 +2608,7 @@ msgstr ""
 msgid "deploy labels stanza present"
 msgstr ""
 
-#: cli/app/deploy.go:414
+#: cli/app/deploy.go:395
 #, fuzzy
 msgid "deploy latest recipe version"
 msgstr "Publicar una nueva versión de una receta"
@@ -2678,11 +2711,11 @@ msgstr ""
 msgid "dirty: %v, "
 msgstr ""
 
-#: cli/app/deploy.go:406 cli/app/rollback.go:368 cli/app/upgrade.go:478
+#: cli/app/deploy.go:387 cli/app/rollback.go:363 cli/app/upgrade.go:473
 msgid "disable converge logic checks"
 msgstr ""
 
-#: cli/app/deploy.go:398 cli/app/rollback.go:360 cli/app/upgrade.go:470
+#: cli/app/deploy.go:379 cli/app/rollback.go:355 cli/app/upgrade.go:465
 msgid "disable public DNS checks"
 msgstr ""
 
@@ -2742,7 +2775,7 @@ msgstr ""
 msgid "download <domain> [flags]"
 msgstr "descargar <domain> [flags]"
 
-#: cli/internal/deploy.go:227
+#: cli/internal/deploy.go:219
 msgid "dry run"
 msgstr ""
 
@@ -2830,7 +2863,7 @@ msgstr ""
 msgid "ensure \"image: ...\" set on all services"
 msgstr ""
 
-#: cli/app/deploy.go:113
+#: cli/app/deploy.go:114
 #, c-format
 msgid "ensure recipe: %s"
 msgstr ""
@@ -2927,8 +2960,8 @@ msgstr ""
 
 #. translators: `abra recipe fetch` aliases. use a comma separated list of aliases
 #. with no spaces in between
-#: cli/app/deploy.go:388 cli/app/remove.go:163 cli/app/rollback.go:350
+#: cli/app/deploy.go:369 cli/app/remove.go:163 cli/app/rollback.go:345
-#: cli/app/secret.go:593 cli/app/upgrade.go:460 cli/app/volume.go:217
+#: cli/app/secret.go:593 cli/app/upgrade.go:455 cli/app/volume.go:217
 #: cli/recipe/fetch.go:20 cli/recipe/fetch.go:138
 msgid "f"
 msgstr ""
@@ -3165,8 +3198,8 @@ msgstr ""
 msgid "for %s read env %s with value: %s from docker service"
 msgstr ""
 
-#: cli/app/deploy.go:387 cli/app/remove.go:162 cli/app/rollback.go:349
+#: cli/app/deploy.go:368 cli/app/remove.go:162 cli/app/rollback.go:344
-#: cli/app/upgrade.go:459 cli/app/volume.go:216 cli/recipe/fetch.go:137
+#: cli/app/upgrade.go:454 cli/app/volume.go:216 cli/recipe/fetch.go:137
 msgid "force"
 msgstr ""
 
@@ -3225,6 +3258,11 @@ msgstr ""
 msgid "generated secrets %s shown again, please take note of them %s"
 msgstr ""
 
+#: cli/app/deploy.go:106
+#, c-format
+msgid "get deploy version: %s"
+msgstr ""
+
 #: pkg/app/compose.go:81
 #, c-format
 msgid "get label '%s'"
@@ -3382,7 +3420,7 @@ msgid "id: %s, "
 msgstr ""
 
 #: cli/app/backup.go:321 cli/app/backup.go:337 cli/app/check.go:97
-#: cli/app/cmd.go:287 cli/app/cp.go:387 cli/app/deploy.go:382
+#: cli/app/cmd.go:287 cli/app/cp.go:387 cli/app/deploy.go:363
 #: cli/app/labels.go:145 cli/app/new.go:379 cli/app/ps.go:215
 #: cli/app/restart.go:164 cli/app/restore.go:140 cli/app/secret.go:571
 #: cli/app/secret.go:611 cli/app/secret.go:635 cli/app/secret.go:643
@@ -3391,7 +3429,7 @@ msgstr ""
 msgid "ignore uncommitted recipes changes"
 msgstr ""
 
-#: cli/app/undeploy.go:155 cli/server/prune.go:74
+#: cli/app/undeploy.go:150 cli/server/prune.go:74
 #, c-format
 msgid "images pruned: %d; space reclaimed: %s"
 msgstr ""
@@ -3582,7 +3620,7 @@ msgstr ""
 #. no spaces in between
 #. translators: `abra recipe lint` aliases. use a comma separated list of
 #. aliases with no spaces in between
-#: cli/app/cmd.go:261 cli/app/deploy.go:412 cli/app/logs.go:20
+#: cli/app/cmd.go:261 cli/app/deploy.go:393 cli/app/logs.go:20
 #: cli/recipe/lint.go:17 cli/server/add.go:207
 msgid "l"
 msgstr ""
@@ -3592,7 +3630,7 @@ msgstr ""
 msgid "labels <domain> [flags]"
 msgstr "etiquetas <domain> [flags]"
 
-#: cli/app/deploy.go:411 cli/app/list.go:183
+#: cli/app/deploy.go:392 cli/app/list.go:183
 msgid "latest"
 msgstr ""
 
@@ -3849,7 +3887,7 @@ msgid ""
 "instead of \"swarm\""
 msgstr ""
 
-#: cli/app/undeploy.go:147 cli/server/prune.go:60
+#: cli/app/undeploy.go:142 cli/server/prune.go:60
 #, c-format
 msgid "networks pruned: %d"
 msgstr ""
@@ -4076,11 +4114,11 @@ msgstr ""
 msgid "no volumes to remove"
 msgstr ""
 
-#: cli/app/deploy.go:403 cli/app/rollback.go:365 cli/app/upgrade.go:475
+#: cli/app/deploy.go:384 cli/app/rollback.go:360 cli/app/upgrade.go:470
 msgid "no-converge-checks"
 msgstr ""
 
-#: cli/app/deploy.go:395 cli/app/rollback.go:357 cli/app/upgrade.go:467
+#: cli/app/deploy.go:376 cli/app/rollback.go:352 cli/app/upgrade.go:462
 msgid "no-domain-checks"
 msgstr ""
 
@@ -4092,7 +4130,7 @@ msgstr ""
 msgid "no-tty"
 msgstr ""
 
-#: cli/internal/deploy.go:257
+#: cli/internal/deploy.go:249
 #, c-format
 msgid "not enough arguments: %s"
 msgstr ""
@@ -4147,7 +4185,7 @@ msgstr ""
 msgid "only show errors"
 msgstr ""
 
-#: cli/app/upgrade.go:486
+#: cli/app/upgrade.go:481
 msgid "only show release notes"
 msgstr ""
 
@@ -4161,7 +4199,7 @@ msgstr ""
 #. aliases with no spaces in between
 #: cli/app/backup.go:295 cli/app/new.go:361 cli/app/ps.go:29
 #: cli/app/secret.go:561 cli/app/secret.go:585 cli/app/secret.go:625
-#: cli/app/undeploy.go:168 cli/catalogue/catalogue.go:294
+#: cli/app/undeploy.go:163 cli/catalogue/catalogue.go:294
 #: cli/recipe/list.go:112 cli/recipe/release.go:672 cli/server/prune.go:18
 msgid "p"
 msgstr ""
@@ -4181,22 +4219,22 @@ msgstr ""
 msgid "parsed following command arguments: %s"
 msgstr ""
 
-#: cli/app/upgrade.go:343
+#: cli/app/upgrade.go:338
 #, c-format
 msgid "parsing chosen upgrade version failed: %s"
 msgstr ""
 
-#: cli/app/upgrade.go:387
+#: cli/app/upgrade.go:382
 #, c-format
 msgid "parsing deployed version failed: %s"
 msgstr ""
 
-#: cli/app/upgrade.go:348
+#: cli/app/upgrade.go:343
 #, c-format
 msgid "parsing deployment version failed: %s"
 msgstr ""
 
-#: cli/app/upgrade.go:354 cli/app/upgrade.go:393
+#: cli/app/upgrade.go:349 cli/app/upgrade.go:388
 #, c-format
 msgid "parsing recipe version failed: %s"
 msgstr ""
@@ -4224,8 +4262,8 @@ msgstr ""
 msgid "pattern"
 msgstr ""
 
-#: cli/app/deploy.go:390 cli/app/remove.go:165 cli/app/rollback.go:352
+#: cli/app/deploy.go:371 cli/app/remove.go:165 cli/app/rollback.go:347
-#: cli/app/upgrade.go:462 cli/app/volume.go:219
+#: cli/app/upgrade.go:457 cli/app/volume.go:219
 msgid "perform action without further prompt"
 msgstr ""
 
@@ -4234,22 +4272,22 @@ msgstr ""
 msgid "please fix your synced label for %s and re-run this command"
 msgstr ""
 
-#: cli/app/rollback.go:264
+#: cli/app/rollback.go:259
 #, c-format
 msgid "please select a downgrade (version: %s):"
 msgstr ""
 
-#: cli/app/rollback.go:269
+#: cli/app/rollback.go:264
 #, c-format
 msgid "please select a downgrade (version: %s, chaos: %s):"
 msgstr ""
 
-#: cli/app/upgrade.go:310
+#: cli/app/upgrade.go:305
 #, c-format
 msgid "please select an upgrade (version: %s):"
 msgstr ""
 
-#: cli/app/upgrade.go:315
+#: cli/app/upgrade.go:310
 #, c-format
 msgid "please select an upgrade (version: %s, chaos: %s):"
 msgstr ""
@@ -4277,7 +4315,7 @@ msgstr ""
 msgid "print machine-readable output"
 msgstr ""
 
-#: cli/internal/deploy.go:231
+#: cli/internal/deploy.go:223
 msgid "proceed?"
 msgstr ""
 
@@ -4291,7 +4329,7 @@ msgstr ""
 msgid "proposed images: %v"
 msgstr ""
 
-#: cli/app/undeploy.go:167
+#: cli/app/undeploy.go:162
 msgid "prune"
 msgstr ""
 
@@ -4300,7 +4338,7 @@ msgstr ""
 msgid "prune <server> [flags]"
 msgstr "limpiar <server> [flags]"
 
-#: cli/app/undeploy.go:170
+#: cli/app/undeploy.go:165
 msgid "prune unused containers, networks, and dangling images"
 msgstr ""
 
@@ -4334,7 +4372,7 @@ msgstr ""
 #. translators: `abra recipe` aliases. use a comma separated list of aliases
 #. with no spaces in between
 #: cli/app/backup.go:327 cli/app/list.go:303 cli/app/move.go:346
-#: cli/app/run.go:23 cli/app/upgrade.go:484 cli/catalogue/catalogue.go:302
+#: cli/app/run.go:23 cli/app/upgrade.go:479 cli/catalogue/catalogue.go:302
 #: cli/recipe/recipe.go:12 cli/recipe/release.go:640 cli/recipe/sync.go:270
 msgid "r"
 msgstr ""
@@ -4453,7 +4491,7 @@ msgstr ""
 msgid "release <recipe> [version] [flags]"
 msgstr "publicar <recipe> [version] [flags]"
 
-#: cli/app/upgrade.go:483
+#: cli/app/upgrade.go:478
 msgid "releasenotes"
 msgstr ""
 
@@ -4759,7 +4797,7 @@ msgstr ""
 msgid "run command locally"
 msgstr ""
 
-#: cli/app/deploy.go:269 cli/app/upgrade.go:291
+#: cli/app/deploy.go:255 cli/app/upgrade.go:286
 #, c-format
 msgid "run the following post-deploy commands: %s"
 msgstr ""
@@ -4769,7 +4807,7 @@ msgstr ""
 msgid "running backup %s on %s with exec config %v"
 msgstr ""
 
-#: cli/internal/deploy.go:287
+#: cli/internal/deploy.go:279
 #, c-format
 msgid "running command %s %s within the context of %s_%s"
 msgstr ""
@@ -4789,7 +4827,7 @@ msgstr ""
 msgid "running command: %s"
 msgstr ""
 
-#: cli/internal/deploy.go:265
+#: cli/internal/deploy.go:257
 #, c-format
 msgid "running post-command '%s %s' in container %s"
 msgstr ""
@@ -4848,7 +4886,7 @@ msgstr ""
 msgid "secret not found: %s"
 msgstr ""
 
-#: cli/app/deploy.go:324
+#: cli/app/deploy.go:310
 #, c-format
 msgid "secret not generated: %s"
 msgstr ""
@@ -4971,7 +5009,7 @@ msgstr ""
 msgid "severity"
 msgstr ""
 
-#: cli/app/deploy.go:422 cli/app/rollback.go:376 cli/app/upgrade.go:494
+#: cli/app/deploy.go:403 cli/app/rollback.go:371 cli/app/upgrade.go:489
 msgid "show all configs & images, including unchanged ones"
 msgstr ""
 
@@ -4995,7 +5033,7 @@ msgstr ""
 msgid "show debug messages"
 msgstr ""
 
-#: cli/app/deploy.go:419 cli/app/rollback.go:373 cli/app/upgrade.go:491
+#: cli/app/deploy.go:400 cli/app/rollback.go:368 cli/app/upgrade.go:486
 msgid "show-unchanged"
 msgstr ""
 
@@ -5043,11 +5081,11 @@ msgstr ""
 msgid "skipping converge logic checks"
 msgstr ""
 
-#: cli/app/deploy.go:197
+#: cli/app/deploy.go:186
 msgid "skipping domain checks"
 msgstr ""
 
-#: cli/app/deploy.go:194
+#: cli/app/deploy.go:183
 msgid "skipping domain checks, no DOMAIN=... configured"
 msgstr ""
 
@@ -5577,7 +5615,7 @@ msgstr ""
 msgid "undeploy <domain> [flags]"
 msgstr "desarmar <domain> [flags]"
 
-#: cli/app/undeploy.go:116
+#: cli/app/undeploy.go:111
 msgid "undeploy succeeded 🟢"
 msgstr ""
 
@@ -5781,7 +5819,7 @@ msgstr ""
 msgid "version %s saved to %s.env"
 msgstr ""
 
-#: cli/app/deploy.go:116
+#: cli/app/deploy.go:117
 #, c-format
 msgid ""
 "version '%s' appears to be a chaos commit, but --chaos/-C was not provided"
@@ -5806,27 +5844,32 @@ msgstr ""
 msgid "version wiped from %s.env"
 msgstr ""
 
-#: cli/app/deploy.go:338
+#: cli/app/deploy.go:337
+#, c-format
+msgid "version: can not redeploy chaos version %s"
+msgstr ""
+
+#: cli/app/deploy.go:324
 #, c-format
 msgid "version: taking chaos version: %s"
 msgstr ""
 
-#: cli/app/deploy.go:364
+#: cli/app/deploy.go:345
 #, c-format
 msgid "version: taking deployed version: %s"
 msgstr ""
 
-#: cli/app/deploy.go:369
+#: cli/app/deploy.go:350
 #, c-format
 msgid "version: taking new recipe version: %s"
 msgstr ""
 
-#: cli/app/deploy.go:358
+#: cli/app/deploy.go:339
 #, c-format
 msgid "version: taking version from .env file: %s"
 msgstr ""
 
-#: cli/app/deploy.go:344
+#: cli/app/deploy.go:330
 #, c-format
 msgid "version: taking version from cli arg: %s"
 msgstr ""
@@ -5952,8 +5995,8 @@ msgstr ""
 msgid "writer: %v, "
 msgstr ""
 
-#: cli/app/deploy.go:276 cli/app/new.go:221 cli/app/rollback.go:253
+#: cli/app/deploy.go:262 cli/app/new.go:221 cli/app/rollback.go:248
-#: cli/app/undeploy.go:119 cli/app/upgrade.go:299
+#: cli/app/undeploy.go:114 cli/app/upgrade.go:294
 #, c-format
 msgid "writing recipe version failed: %s"
 msgstr ""

pkg/recipe/git.go

@@ -49,7 +49,7 @@ func (r Recipe) Ensure(ctx EnsureContext) error {
 	if r.EnvVersion != "" && !ctx.IgnoreEnvVersion {
 		log.Debug(i18n.G("ensuring env version %s", r.EnvVersion))
 		if strings.Contains(r.EnvVersion, "+U") {
-			return errors.New(i18n.G(`cannot redeploy previous chaos version (%s), did you mean to use "--chaos"?`))
+			return errors.New(i18n.G("can not redeploy chaos version (%s) without --chaos", r.EnvVersion))
 		}
 
 		if _, err := r.EnsureVersion(r.EnvVersion); err != nil {

pkg/upstream/stack/remove.go

@@ -247,7 +247,7 @@ func waitOnTasks(ctx context.Context, client apiclient.APIClient, namespace stri
 			}
 		}
 
-		if terminalStatesReached >= len(tasks) {
+		if terminalStatesReached == len(tasks) {
 			log.Debug(i18n.G("all tasks reached terminal state"))
 			break
 		}

tests/integration/app_deploy.bats

@@ -175,7 +175,7 @@ teardown(){
 }
 
 # bats test_tags=slow
-@test "do not bail if env version is a hash but no --chaos" {
+@test "bail if env has a hash but no --chaos" {
   wantHash=$(_get_n_hash 3)
 
   run git -C "$ABRA_DIR/recipes/$TEST_RECIPE" reset --hard HEAD~3