WIP: operator collaboration MVP

See toolshed/organising#467
2024-12-30 00:46:25 +01:00
1613 changed files with 62306 additions and 79178 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -3,14 +3,14 @@ kind: pipeline
 name: coopcloud.tech/abra
 steps:
  - name: make check
-    image: golang:1.24
+    image: golang:1.22
    commands:
      - make check

  - name: make test
-    image: golang:1.24
+    image: golang:1.22
    environment:
-      CATL_URL: https://git.coopcloud.tech/toolshed/recipes-catalogue-json.git
+      CATL_URL: https://git.coopcloud.tech/coop-cloud/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:v2.5.1
+    image: goreleaser/goreleaser:v1.24.0
    environment:
      GITEA_TOKEN:
        from_secret: goreleaser_gitea_token
@ -47,10 +47,10 @@ steps:
    image: plugins/docker
    settings:
      auto_tag: true
-      username: abra-bot
+      username: 3wordchant
      password:
-        from_secret: git_coopcloud_tech_token_abra_bot
-      repo: git.coopcloud.tech/toolshed/abra
+        from_secret: git_coopcloud_tech_token_3wc
+      repo: git.coopcloud.tech/coop-cloud/abra
      tags: dev
      registry: git.coopcloud.tech
    when:
@ -60,7 +60,7 @@ steps:
      - make check
      - make test

-  - name: on-demand integration test
+  - name: integration test
    image: appleboy/drone-ssh
    settings:
      host:
@ -74,31 +74,7 @@ steps:
      request_pty: true
      script:
        - |
-          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:
-      ref:
-        - refs/heads/int-*
-    depends_on:
-      - make check
-      - make test
-
-  - name: nightly integration test
-    image: appleboy/drone-ssh
-    settings:
-      host:
-        - int.coopcloud.tech
-      username: abra
-      key:
-        from_secret: abra_int_private_key
-      port: 22
-      command_timeout: 60m
-      script_stop: true
-      request_pty: true
-      script:
-        - |
-          wget https://git.coopcloud.tech/toolshed/abra/raw/branch/main/scripts/tests/run-ci-int -O run-ci-int
+          wget https://git.coopcloud.tech/coop-cloud/abra/raw/branch/main/scripts/tests/run-ci-int -O run-ci-int
          chmod +x run-ci-int
          sh run-ci-int
    when:
@ -111,8 +87,3 @@ steps:
 volumes:
  - name: deps
    temp: {}
-
-trigger:
-  action:
-    exclude:
-      - synchronized
--- a/.envrc.sample
+++ b/.envrc.sample
@ -1,6 +1,6 @@
 # integration test suite
 # export ABRA_DIR="$HOME/.abra_test"
-# export TEST_SERVER=test.example.com
+# export ABRA_TEST_DOMAIN=test.example.com
 # export ABRA_CI=1

 # release automation
--- a/.gitea/ISSUE_TEMPLATE.md
+++ b/.gitea/ISSUE_TEMPLATE.md
@ -0,0 +1,8 @@
+---
+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)
--- a/AUTHORS.md
+++ b/AUTHORS.md
@ -4,7 +4,6 @@
 > please do add yourself! This is a community project, let's show some 💞

 - 3wordchant
- ammaratef45
 - cassowary
 - codegod100
 - decentral1se
@ -18,5 +17,3 @@
 - roxxers
 - vera
 - yksflip
- basebuilder
- mayel
--- a/4
+++ b/4
@ -1,7 +1,7 @@
 # Build image
-FROM golang:1.24-alpine AS build
+FROM golang:1.22-alpine AS build

-ENV GOPRIVATE=coopcloud.tech
+ENV GOPRIVATE coopcloud.tech

 RUN apk add --no-cache \
  gcc \
--- a/2
+++ b/2
@ -2,7 +2,7 @@ ABRA         := ./cmd/abra
 KADABRA      := ./cmd/kadabra
 COMMIT       := $(shell git rev-list -1 HEAD)
 GOPATH       := $(shell go env GOPATH)
-GOVERSION    := 1.24
+GOVERSION    := 1.22
 LDFLAGS      := "-X 'main.Commit=$(COMMIT)'"
 DIST_LDFLAGS := $(LDFLAGS)" -s -w"
 GCFLAGS      := "all=-l -B"
--- a/README.md
+++ b/README.md
@ -1,9 +1,8 @@
 # `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)
+[![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)
 [![Go Reference](https://pkg.go.dev/badge/coopcloud.tech/abra.svg)](https://pkg.go.dev/coopcloud.tech/abra)
-[![Translation status](https://translate.coopcloud.tech/widget/co-op-cloud/svg-badge.svg)](https://translate.coopcloud.tech/engage/co-op-cloud/)

 The Co-op Cloud utility belt 🎩🐇

--- a/cli/app/app.go
+++ b/cli/app/app.go
@ -1,12 +1,11 @@
 package app

 import (
-	"github.com/leonelquinteros/gotext"
 	"github.com/spf13/cobra"
 )

 var AppCommand = &cobra.Command{
-	Use:     gotext.Get("app [cmd] [args] [flags]"),
-	Aliases: []string{gotext.Get("a")},
-	Short:   gotext.Get("Manage apps"),
+	Use:     "app [cmd] [args] [flags]",
+	Aliases: []string{"a"},
+	Short:   "Manage apps",
 }
--- a/cli/app/backup.go
+++ b/cli/app/backup.go
@ -7,14 +7,13 @@ import (
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/client"
 	"coopcloud.tech/abra/pkg/log"
-	"github.com/leonelquinteros/gotext"
 	"github.com/spf13/cobra"
 )

 var AppBackupListCommand = &cobra.Command{
-	Use:     gotext.Get("list <domain> [flags]"),
-	Aliases: []string{gotext.Get("ls")},
-	Short:   gotext.Get("List the contents of a snapshot"),
+	Use:     "list <app> [flags]",
+	Aliases: []string{"ls"},
+	Short:   "List the contents of a snapshot",
 	Args:    cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@ -41,17 +40,17 @@ var AppBackupListCommand = &cobra.Command{
 		}

 		if snapshot != "" {
-			log.Debug(gotext.Get("including SNAPSHOT=%s in backupbot exec invocation", snapshot))
+			log.Debugf("including SNAPSHOT=%s in backupbot exec invocation", snapshot)
 			execEnv = append(execEnv, fmt.Sprintf("SNAPSHOT=%s", snapshot))
 		}

 		if showAllPaths {
-			log.Debug(gotext.Get("including SHOW_ALL=%v in backupbot exec invocation", showAllPaths))
+			log.Debugf("including SHOW_ALL=%v in backupbot exec invocation", showAllPaths)
 			execEnv = append(execEnv, fmt.Sprintf("SHOW_ALL=%v", showAllPaths))
 		}

 		if timestamps {
-			log.Debug(gotext.Get("including TIMESTAMPS=%v in backupbot exec invocation", timestamps))
+			log.Debugf("including TIMESTAMPS=%v in backupbot exec invocation", timestamps)
 			execEnv = append(execEnv, fmt.Sprintf("TIMESTAMPS=%v", timestamps))
 		}

@ -62,13 +61,13 @@ var AppBackupListCommand = &cobra.Command{
 }

 var AppBackupDownloadCommand = &cobra.Command{
-	Use:     gotext.Get("download <domain> [flags]"),
-	Aliases: []string{gotext.Get("d")},
-	Short:   gotext.Get("Download a snapshot"),
-	Long: gotext.Get(`Downloads a backup.tar.gz to the current working directory.
+	Use:     "download <app> [flags]",
+	Aliases: []string{"d"},
+	Short:   "Download a snapshot",
+	Long: `Downloads a backup.tar.gz to the current working directory.

 "--volumes/-v" includes data contained in volumes alongide paths specified in
-"backupbot.backup.path" labels.`),
+"backupbot.backup.path" labels.`,
 	Args: cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@ -79,7 +78,7 @@ var AppBackupDownloadCommand = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		app := internal.ValidateApp(args)

-		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
+		if err := app.Recipe.Ensure(internal.Chaos, internal.Offline); err != nil {
 			log.Fatal(err)
 		}

@ -99,22 +98,22 @@ var AppBackupDownloadCommand = &cobra.Command{
 		}

 		if snapshot != "" {
-			log.Debug(gotext.Get("including SNAPSHOT=%s in backupbot exec invocation", snapshot))
+			log.Debugf("including SNAPSHOT=%s in backupbot exec invocation", snapshot)
 			execEnv = append(execEnv, fmt.Sprintf("SNAPSHOT=%s", snapshot))
 		}

 		if includePath != "" {
-			log.Debug(gotext.Get("including INCLUDE_PATH=%s in backupbot exec invocation", includePath))
+			log.Debugf("including INCLUDE_PATH=%s in backupbot exec invocation", includePath)
 			execEnv = append(execEnv, fmt.Sprintf("INCLUDE_PATH=%s", includePath))
 		}

 		if includeSecrets {
-			log.Debug(gotext.Get("including SECRETS=%v in backupbot exec invocation", includeSecrets))
+			log.Debugf("including SECRETS=%v in backupbot exec invocation", includeSecrets)
 			execEnv = append(execEnv, fmt.Sprintf("SECRETS=%v", includeSecrets))
 		}

 		if includeVolumes {
-			log.Debug(gotext.Get("including VOLUMES=%v in backupbot exec invocation", includeVolumes))
+			log.Debugf("including VOLUMES=%v in backupbot exec invocation", includeVolumes)
 			execEnv = append(execEnv, fmt.Sprintf("VOLUMES=%v", includeVolumes))
 		}

@ -131,9 +130,9 @@ var AppBackupDownloadCommand = &cobra.Command{
 }

 var AppBackupCreateCommand = &cobra.Command{
-	Use:     gotext.Get("create <domain> [flags]"),
-	Aliases: []string{gotext.Get("c")},
-	Short:   gotext.Get("Create a new snapshot"),
+	Use:     "create <app> [flags]",
+	Aliases: []string{"c"},
+	Short:   "Create a new snapshot",
 	Args:    cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@ -144,7 +143,7 @@ var AppBackupCreateCommand = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		app := internal.ValidateApp(args)

-		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
+		if err := app.Recipe.Ensure(internal.Chaos, internal.Offline); err != nil {
 			log.Fatal(err)
 		}

@ -164,7 +163,7 @@ var AppBackupCreateCommand = &cobra.Command{
 		}

 		if retries != "" {
-			log.Debug(gotext.Get("including RETRIES=%s in backupbot exec invocation", retries))
+			log.Debugf("including RETRIES=%s in backupbot exec invocation", retries)
 			execEnv = append(execEnv, fmt.Sprintf("RETRIES=%s", retries))
 		}

@ -175,9 +174,9 @@ var AppBackupCreateCommand = &cobra.Command{
 }

 var AppBackupSnapshotsCommand = &cobra.Command{
-	Use:     gotext.Get("snapshots <domain> [flags]"),
+	Use:     "snapshots <app> [flags]",
 	Aliases: []string{"s"},
-	Short:   gotext.Get("List all snapshots"),
+	Short:   "List all snapshots",
 	Args:    cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@ -210,9 +209,9 @@ var AppBackupSnapshotsCommand = &cobra.Command{
 }

 var AppBackupCommand = &cobra.Command{
-	Use:     gotext.Get("backup [cmd] [args] [flags]"),
-	Aliases: []string{gotext.Get("b")},
-	Short:   gotext.Get("Manage app backups"),
+	Use:     "backup [cmd] [args] [flags]",
+	Aliases: []string{"b"},
+	Short:   "Manage app backups",
 }

 var (
@ -231,7 +230,7 @@ func init() {
 		"snapshot",
 		"s",
 		"",
-		gotext.Get("list specific snapshot"),
+		"list specific snapshot",
 	)

 	AppBackupListCommand.Flags().BoolVarP(
@ -239,7 +238,7 @@ func init() {
 		"all",
 		"a",
 		false,
-		gotext.Get("show all paths"),
+		"show all paths",
 	)

 	AppBackupListCommand.Flags().BoolVarP(
@ -247,7 +246,7 @@ func init() {
 		"timestamps",
 		"t",
 		false,
-		gotext.Get("include timestamps"),
+		"include timestamps",
 	)

 	AppBackupDownloadCommand.Flags().StringVarP(
@ -255,7 +254,7 @@ func init() {
 		"snapshot",
 		"s",
 		"",
-		gotext.Get("list specific snapshot"),
+		"list specific snapshot",
 	)

 	AppBackupDownloadCommand.Flags().StringVarP(
@ -263,7 +262,7 @@ func init() {
 		"path",
 		"p",
 		"",
-		gotext.Get("volumes path"),
+		"volumes path",
 	)

 	AppBackupDownloadCommand.Flags().BoolVarP(
@ -271,7 +270,7 @@ func init() {
 		"secrets",
 		"S",
 		false,
-		gotext.Get("include secrets"),
+		"include secrets",
 	)

 	AppBackupDownloadCommand.Flags().BoolVarP(
@ -279,7 +278,7 @@ func init() {
 		"volumes",
 		"v",
 		false,
-		gotext.Get("include volumes"),
+		"include volumes",
 	)

 	AppBackupDownloadCommand.Flags().BoolVarP(
@ -287,7 +286,7 @@ func init() {
 		"chaos",
 		"C",
 		false,
-		gotext.Get("ignore uncommitted recipes changes"),
+		"ignore uncommitted recipes changes",
 	)

 	AppBackupCreateCommand.Flags().StringVarP(
@ -295,7 +294,7 @@ func init() {
 		"retries",
 		"r",
 		"1",
-		gotext.Get("number of retry attempts"),
+		"number of retry attempts",
 	)

 	AppBackupCreateCommand.Flags().BoolVarP(
@ -303,6 +302,6 @@ func init() {
 		"chaos",
 		"C",
 		false,
-		gotext.Get("ignore uncommitted recipes changes"),
+		"ignore uncommitted recipes changes",
 	)
 }
--- a/cli/app/check.go
+++ b/cli/app/check.go
@ -9,15 +9,14 @@ import (
 	"coopcloud.tech/abra/pkg/formatter"
 	"coopcloud.tech/abra/pkg/log"
 	"github.com/charmbracelet/lipgloss"
-	"github.com/leonelquinteros/gotext"
 	"github.com/spf13/cobra"
 )

 var AppCheckCommand = &cobra.Command{
-	Use:     gotext.Get("check <domain> [flags]"),
-	Aliases: []string{gotext.Get("chk")},
-	Short:   gotext.Get("Ensure an app is well configured"),
-	Long: gotext.Get(`Compare env vars in both the app ".env" and recipe ".env.sample" file.
+	Use:     "check <app> [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.

 The goal is to ensure that recipe ".env.sample" env vars are defined in your
 app ".env" file. Only env var definitions in the ".env.sample" which are
@ -26,7 +25,7 @@ these env vars, then "check" will complain.

 Recipe maintainers may or may not provide defaults for env vars within their
 recipes regardless of commenting or not (e.g. through the use of
-${FOO:<default>} syntax). "check" does not confirm or deny this for you.`),
+${FOO:<default>} syntax). "check" does not confirm or deny this for you.`,
 	Args: cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@ -37,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.GetEnsureContext()); err != nil {
+		if err := app.Recipe.Ensure(internal.Chaos, internal.Offline); err != nil {
 			log.Fatal(err)
 		}

@ -87,6 +86,6 @@ func init() {
 		"chaos",
 		"C",
 		false,
-		gotext.Get("ignore uncommitted recipes changes"),
+		"ignore uncommitted recipes changes",
 	)
 }
--- a/cli/app/cmd.go
+++ b/cli/app/cmd.go
@ -14,15 +14,14 @@ import (
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/client"
 	"coopcloud.tech/abra/pkg/log"
-	"github.com/leonelquinteros/gotext"
 	"github.com/spf13/cobra"
 )

 var AppCmdCommand = &cobra.Command{
-	Use:     gotext.Get("command <domain> [service | --local] <cmd> [[args] [flags] | [flags] -- [args]]"),
-	Aliases: []string{gotext.Get("cmd")},
-	Short:   gotext.Get("Run app commands"),
-	Long: gotext.Get(`Run an app specific command.
+	Use:     "command <app> [service | --local] <cmd> [[args] [flags] | [flags] -- [args]]",
+	Aliases: []string{"cmd"},
+	Short:   "Run app commands",
+	Long: `Run an app specific command.

 These commands are bash functions, defined in the abra.sh of the recipe itself.
 They can be run within the context of a service (e.g. app) or locally on your
@ -31,24 +30,24 @@ work station by passing "--local/-l".
 N.B. If using the "--" style to pass arguments, flags (e.g. "--local/-l") must
 be passed *before* the "--". It is possible to pass arguments without the "--"
 as long as no dashes are present (i.e. "foo" works without "--", "-foo"
-does not).`),
-	Example: gotext.Get(`  # pass <cmd> args/flags without "--"
+does not).`,
+	Example: `  # pass <cmd> args/flags without "--"
  abra app cmd 1312.net app my_cmd_arg foo --user bar

  # pass <cmd> args/flags with "--"
  abra app cmd 1312.net app my_cmd_args --user bar -- foo -vvv

  # drop the [service] arg if using "--local/-l"
-  abra app cmd 1312.net my_cmd --local`),
+  abra app cmd 1312.net my_cmd --local`,
 	Args: func(cmd *cobra.Command, args []string) error {
 		if local {
 			if !(len(args) >= 2) {
-				return errors.New(gotext.Get("requires at least 2 arguments with --local/-l"))
+				return errors.New("requires at least 2 arguments with --local/-l")
 			}

 			if slices.Contains(os.Args, "--") {
 				if cmd.ArgsLenAtDash() > 2 {
-					return errors.New(gotext.Get("accepts at most 2 args with --local/-l"))
+					return errors.New("accepts at most 2 args with --local/-l")
 				}
 			}

@ -64,7 +63,7 @@ does not).`),
 		}

 		if !(len(args) >= 3) {
-			return errors.New(gotext.Get("requires at least 3 arguments"))
+			return errors.New("requires at least 3 arguments")
 		}

 		return nil
@ -93,19 +92,19 @@ does not).`),
 	Run: func(cmd *cobra.Command, args []string) {
 		app := internal.ValidateApp(args)

-		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
+		if err := app.Recipe.Ensure(internal.Chaos, internal.Offline); err != nil {
 			log.Fatal(err)
 		}

 		if local && remoteUser != "" {
-			log.Fatal(gotext.Get("cannot use --local & --user together"))
+			log.Fatal("cannot use --local & --user together")
 		}

 		hasCmdArgs, parsedCmdArgs := parseCmdArgs(args, local)

 		if _, err := os.Stat(app.Recipe.AbraShPath); err != nil {
 			if os.IsNotExist(err) {
-				log.Fatal(gotext.Get("%s does not exist for %s?", app.Recipe.AbraShPath, app.Name))
+				log.Fatalf("%s does not exist for %s?", app.Recipe.AbraShPath, app.Name)
 			}
 			log.Fatal(err)
 		}
@ -116,7 +115,7 @@ does not).`),
 				log.Fatal(err)
 			}

-			log.Debug(gotext.Get("--local detected, running %s on local work station", cmdName))
+			log.Debugf("--local detected, running %s on local work station", cmdName)

 			var exportEnv string
 			for k, v := range app.Env {
@ -125,16 +124,16 @@ does not).`),

 			var sourceAndExec string
 			if hasCmdArgs {
-				log.Debug(gotext.Get("parsed following command arguments: %s", parsedCmdArgs))
+				log.Debugf("parsed following command arguments: %s", parsedCmdArgs)
 				sourceAndExec = fmt.Sprintf("TARGET=local; APP_NAME=%s; STACK_NAME=%s; %s . %s; %s %s", app.Name, app.StackName(), exportEnv, app.Recipe.AbraShPath, cmdName, parsedCmdArgs)
 			} else {
-				log.Debug(gotext.Get("did not detect any command arguments"))
+				log.Debug("did not detect any command arguments")
 				sourceAndExec = fmt.Sprintf("TARGET=local; APP_NAME=%s; STACK_NAME=%s; %s . %s; %s", app.Name, app.StackName(), exportEnv, app.Recipe.AbraShPath, cmdName)
 			}

 			shell := "/bin/bash"
 			if _, err := os.Stat(shell); errors.Is(err, os.ErrNotExist) {
-				log.Debug(gotext.Get("%s does not exist locally, use /bin/sh as fallback", shell))
+				log.Debugf("%s does not exist locally, use /bin/sh as fallback", shell)
 				shell = "/bin/sh"
 			}
 			cmd := exec.Command(shell, "-c", sourceAndExec)
@ -165,15 +164,15 @@ does not).`),
 		}

 		if !matchingServiceName {
-			log.Fatal(gotext.Get("no service %s for %s?", targetServiceName, app.Name))
+			log.Fatalf("no service %s for %s?", targetServiceName, app.Name)
 		}

-		log.Debug(gotext.Get("running command %s within the context of %s_%s", cmdName, app.StackName(), targetServiceName))
+		log.Debugf("running command %s within the context of %s_%s", cmdName, app.StackName(), targetServiceName)

 		if hasCmdArgs {
-			log.Debug(gotext.Get("parsed following command arguments: %s", parsedCmdArgs))
+			log.Debugf("parsed following command arguments: %s", parsedCmdArgs)
 		} else {
-			log.Debug(gotext.Get("did not detect any command arguments"))
+			log.Debug("did not detect any command arguments")
 		}

 		cl, err := client.New(app.Server)
@ -184,7 +183,7 @@ does not).`),
 		if err := internal.RunCmdRemote(
 			cl,
 			app,
-			disableTTY,
+			requestTTY,
 			app.Recipe.AbraShPath,
 			targetServiceName, cmdName, parsedCmdArgs, remoteUser); err != nil {
 			log.Fatal(err)
@ -193,14 +192,14 @@ does not).`),
 }

 var AppCmdListCommand = &cobra.Command{
-	Use:     gotext.Get("list <domain> [flags]"),
-	Aliases: []string{gotext.Get("ls")},
-	Short:   gotext.Get("List all available commands"),
+	Use:     "list <app> [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.GetEnsureContext()); err != nil {
+		if err := app.Recipe.Ensure(internal.Chaos, internal.Offline); err != nil {
 			log.Fatal(err)
 		}

@ -239,7 +238,7 @@ func parseCmdArgs(args []string, isLocal bool) (bool, string) {
 var (
 	local      bool
 	remoteUser string
-	disableTTY bool
+	requestTTY bool
 )

 func init() {
@ -248,7 +247,7 @@ func init() {
 		"local",
 		"l",
 		false,
-		gotext.Get("run command locally"),
+		"run command locally",
 	)

 	AppCmdCommand.Flags().StringVarP(
@ -256,15 +255,15 @@ func init() {
 		"user",
 		"u",
 		"",
-		gotext.Get("request remote user"),
+		"request remote user",
 	)

 	AppCmdCommand.Flags().BoolVarP(
-		&disableTTY,
+		&requestTTY,
 		"tty",
-		"T",
+		"t",
 		false,
-		gotext.Get("disable remote TTY"),
+		"request remote TTY",
 	)

 	AppCmdCommand.Flags().BoolVarP(
@ -272,6 +271,6 @@ func init() {
 		"chaos",
 		"C",
 		false,
-		gotext.Get("ignore uncommitted recipes changes"),
+		"ignore uncommitted recipes changes",
 	)
 }
--- a/cli/app/cmd_test.go
+++ b/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/toolshed/organising/issues/336 for more
+		// see https://git.coopcloud.tech/coop-cloud/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 "},
--- a/cli/app/config.go
+++ b/cli/app/config.go
@ -8,15 +8,14 @@ import (
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/log"
 	"github.com/AlecAivazis/survey/v2"
-	"github.com/leonelquinteros/gotext"
 	"github.com/spf13/cobra"
 )

 var AppConfigCommand = &cobra.Command{
-	Use:     gotext.Get("config <domain> [flags]"),
-	Aliases: []string{gotext.Get("cfg")},
-	Short:   gotext.Get("Edit app config"),
-	Example: gotext.Get("  abra config 1312.net"),
+	Use:     "config <app> [flags]",
+	Aliases: []string{"cfg"},
+	Short:   "Edit app config",
+	Example: "  abra config 1312.net",
 	Args:    cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@ -33,13 +32,13 @@ var AppConfigCommand = &cobra.Command{
 		appName := args[0]
 		appFile, exists := files[appName]
 		if !exists {
-			log.Fatal(gotext.Get("cannot find app with name %s", appName))
+			log.Fatalf("cannot find app with name %s", appName)
 		}

 		ed, ok := os.LookupEnv("EDITOR")
 		if !ok {
 			edPrompt := &survey.Select{
-				Message: gotext.Get("which editor do you wish to use?"),
+				Message: "which editor do you wish to use?",
 				Options: []string{"vi", "vim", "nvim", "nano", "pico", "emacs"},
 			}
 			if err := survey.AskOne(edPrompt, &ed); err != nil {
--- a/cli/app/cp.go
+++ b/cli/app/cp.go
@ -3,6 +3,7 @@ package app
 import (
 	"context"
 	"errors"
+	"fmt"
 	"io"
 	"os"
 	"path"
@ -17,23 +18,22 @@ import (
 	"coopcloud.tech/abra/pkg/log"
 	"coopcloud.tech/abra/pkg/upstream/container"
 	"github.com/docker/cli/cli/command"
-	containertypes "github.com/docker/docker/api/types/container"
+	"github.com/docker/docker/api/types"
 	dockerClient "github.com/docker/docker/client"
 	"github.com/docker/docker/errdefs"
 	"github.com/docker/docker/pkg/archive"
-	"github.com/leonelquinteros/gotext"
 	"github.com/spf13/cobra"
 )

 var AppCpCommand = &cobra.Command{
-	Use:     gotext.Get("cp <domain> <src> <dst> [flags]"),
-	Aliases: []string{gotext.Get("c")},
-	Short:   gotext.Get("Copy files to/from a deployed app service"),
-	Example: gotext.Get(`  # copy myfile.txt to the root of the app service
+	Use:     "cp <app> <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
  abra app cp 1312.net myfile.txt app:/

  # copy that file back to your current working directory locally
-  abra app cp 1312.net app:/myfile.txt ./`),
+  abra app cp 1312.net app:/myfile.txt`,
 	Args: cobra.ExactArgs(3),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@ -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.GetEnsureContext()); err != nil {
+		if err := app.Recipe.Ensure(internal.Chaos, internal.Offline); err != nil {
 			log.Fatal(err)
 		}

@ -69,7 +69,7 @@ var AppCpCommand = &cobra.Command{
 		if err != nil {
 			log.Fatal(err)
 		}
-		log.Debug(gotext.Get("retrieved %s as target container on %s", formatter.ShortenID(container.ID), app.Server))
+		log.Debugf("retrieved %s as target container on %s", formatter.ShortenID(container.ID), app.Server)

 		if toContainer {
 			err = CopyToContainer(cl, container.ID, srcPath, dstPath)
@ -82,7 +82,7 @@ var AppCpCommand = &cobra.Command{
 	},
 }

-var errServiceMissing = errors.New(gotext.Get("one of <src>/<dest> arguments must take $SERVICE:$PATH form"))
+var errServiceMissing = errors.New("one of <src>/<dest> arguments must take $SERVICE:$PATH form")

 // parseSrcAndDst parses src and dest string. One of src or dst must be of the form $SERVICE:$PATH
 func parseSrcAndDst(src, dst string) (srcPath string, dstPath string, service string, toContainer bool, err error) {
@ -105,7 +105,7 @@ func parseSrcAndDst(src, dst string) (srcPath string, dstPath string, service st
 func CopyToContainer(cl *dockerClient.Client, containerID, srcPath, dstPath string) error {
 	srcStat, err := os.Stat(srcPath)
 	if err != nil {
-		return errors.New(gotext.Get("local %s ", err))
+		return fmt.Errorf("local %s ", err)
 	}

 	dstStat, err := cl.ContainerStatPath(context.Background(), containerID, dstPath)
@ -114,7 +114,7 @@ func CopyToContainer(cl *dockerClient.Client, containerID, srcPath, dstPath stri
 		if errdefs.IsNotFound(err) {
 			dstExists = false
 		} else {
-			return errors.New(gotext.Get("remote path: %s", err))
+			return fmt.Errorf("remote path: %s", err)
 		}
 	}

@ -134,7 +134,7 @@ func CopyToContainer(cl *dockerClient.Client, containerID, srcPath, dstPath stri
 		if err != nil {
 			return err
 		}
-		if _, err := container.RunExec(dcli, cl, containerID, &containertypes.ExecOptions{
+		if _, err := container.RunExec(dcli, cl, containerID, &types.ExecConfig{
 			AttachStderr: true,
 			AttachStdin:  true,
 			AttachStdout: true,
@ -142,7 +142,7 @@ func CopyToContainer(cl *dockerClient.Client, containerID, srcPath, dstPath stri
 			Detach:       false,
 			Tty:          true,
 		}); err != nil {
-			return errors.New(gotext.Get("create remote directory: %s", err))
+			return fmt.Errorf("create remote directory: %s", err)
 		}
 	case CopyModeFileToFile:
 		// Remove the file component from the path, since docker can only copy
@ -161,8 +161,8 @@ func CopyToContainer(cl *dockerClient.Client, containerID, srcPath, dstPath stri
 		return err
 	}

-	log.Debug(gotext.Get("copy %s from local to %s on container", srcPath, dstPath))
-	copyOpts := containertypes.CopyToContainerOptions{AllowOverwriteDirWithFile: false, CopyUIDGID: false}
+	log.Debugf("copy %s from local to %s on container", srcPath, dstPath)
+	copyOpts := types.CopyToContainerOptions{AllowOverwriteDirWithFile: false, CopyUIDGID: false}
 	if err := cl.CopyToContainer(context.Background(), containerID, dstPath, content, copyOpts); err != nil {
 		return err
 	}
@ -173,7 +173,7 @@ func CopyToContainer(cl *dockerClient.Client, containerID, srcPath, dstPath stri
 		if err != nil {
 			return err
 		}
-		if _, err := container.RunExec(dcli, cl, containerID, &containertypes.ExecOptions{
+		if _, err := container.RunExec(dcli, cl, containerID, &types.ExecConfig{
 			AttachStderr: true,
 			AttachStdin:  true,
 			AttachStdout: true,
@ -181,7 +181,7 @@ func CopyToContainer(cl *dockerClient.Client, containerID, srcPath, dstPath stri
 			Detach:       false,
 			Tty:          true,
 		}); err != nil {
-			return errors.New(gotext.Get("create remote directory: %s", err))
+			return fmt.Errorf("create remote directory: %s", err)
 		}
 	}

@ -194,9 +194,9 @@ func CopyFromContainer(cl *dockerClient.Client, containerID, srcPath, dstPath st
 	srcStat, err := cl.ContainerStatPath(context.Background(), containerID, srcPath)
 	if err != nil {
 		if errdefs.IsNotFound(err) {
-			return errors.New(gotext.Get("remote: %s does not exist", srcPath))
+			return fmt.Errorf("remote: %s does not exist", srcPath)
 		} else {
-			return errors.New(gotext.Get("remote path: %s", err))
+			return fmt.Errorf("remote path: %s", err)
 		}
 	}

@ -207,7 +207,7 @@ func CopyFromContainer(cl *dockerClient.Client, containerID, srcPath, dstPath st
 		if os.IsNotExist(err) {
 			dstExists = false
 		} else {
-			return errors.New(gotext.Get("remote path: %s", err))
+			return fmt.Errorf("remote path: %s", err)
 		}
 	} else {
 		dstMode = dstStat.Mode()
@ -242,7 +242,7 @@ func CopyFromContainer(cl *dockerClient.Client, containerID, srcPath, dstPath st

 	content, _, err := cl.CopyFromContainer(context.Background(), containerID, srcPath)
 	if err != nil {
-		return errors.New(gotext.Get("copy: %s", err))
+		return fmt.Errorf("copy: %s", err)
 	}
 	defer content.Close()
 	if err := archive.Untar(content, dstPath, &archive.TarOptions{
@ -250,7 +250,7 @@ func CopyFromContainer(cl *dockerClient.Client, containerID, srcPath, dstPath st
 		Compression:          archive.Gzip,
 		NoLchown:             true,
 	}); err != nil {
-		return errors.New(gotext.Get("untar: %s", err))
+		return fmt.Errorf("untar: %s", err)
 	}

 	if moveDstFile != "" {
@ -269,8 +269,8 @@ func CopyFromContainer(cl *dockerClient.Client, containerID, srcPath, dstPath st
 }

 var (
-	ErrCopyDirToFile  = errors.New(gotext.Get("can't copy dir to file"))
-	ErrDstDirNotExist = errors.New(gotext.Get("destination directory does not exist"))
+	ErrCopyDirToFile  = fmt.Errorf("can't copy dir to file")
+	ErrDstDirNotExist = fmt.Errorf("destination directory does not exist")
 )

 type CopyMode int
@ -378,6 +378,6 @@ func init() {
 		"chaos",
 		"C",
 		false,
-		gotext.Get("ignore uncommitted recipes changes"),
+		"ignore uncommitted recipes changes",
 	)
 }
--- a/cli/app/deploy.go
+++ b/cli/app/deploy.go
@ -3,10 +3,9 @@ package app
 import (
 	"context"
 	"errors"
-	"strings"
+	"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"
@ -19,21 +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/leonelquinteros/gotext"
 	"github.com/spf13/cobra"
 )

 var AppDeployCommand = &cobra.Command{
-	Use:     gotext.Get("deploy <domain> [version] [flags]"),
-	Aliases: []string{gotext.Get("d")},
-	Short:   gotext.Get("Deploy an app"),
-	Long: gotext.Get(`Deploy an app.
+	Use:     "deploy <app> [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 as values for
-"[version]". Please note, "upgrade"/"rollback" do not support chaos operations.`),
-	Example: gotext.Get(`  # standard deployment
+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.`,
+	Example: `  # standard deployment
  abra app deploy 1312.net

  # chaos deployment
@ -43,20 +40,19 @@ checkout as-is. Recipe commit hashes are also supported as values for
  abra app deploy 1312.net 2.0.0+1.2.3

  # deploy a specific git hash
-  abra app deploy 1312.net 886db76d`),
+  abra app deploy 1312.net 886db76d`,
 	Args: cobra.RangeArgs(1, 2),
 	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()
 		case 1:
 			app, err := appPkg.Get(args[0])
 			if err != nil {
-				errMsg := gotext.Get("autocomplete failed: %s", err)
+				errMsg := fmt.Sprintf("autocomplete failed: %s", err)
 				return []string{errMsg}, cobra.ShellCompDirectiveError
 			}
 			return autocomplete.RecipeVersionComplete(app.Recipe.Name)
@ -65,59 +61,124 @@ checkout as-is. Recipe commit hashes are also supported as values for
 		}
 	},
 	Run: func(cmd *cobra.Command, args []string) {
-		var (
-			deployWarnMessages []string
-			toDeployVersion    string
-		)
+		var warnMessages []string

 		app := internal.ValidateApp(args)
+		stackName := app.StackName()

-		if err := validateArgsAndFlags(args); err != nil {
+		ok, err := validateChaosXORVersion(args)
+		if !ok {
+			log.Fatalf(err.Error())
+		}
+
+		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 {
 			log.Fatal(err)
 		}

-		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
+		if err := lint.LintForErrors(app.Recipe); err != nil {
 			log.Fatal(err)
 		}

+		log.Debugf("checking whether %s is already deployed", stackName)
+
 		cl, err := client.New(app.Server)
 		if err != nil {
 			log.Fatal(err)
 		}

-		log.Debug(gotext.Get("checking whether %s is already deployed", app.StackName()))
-
-		deployMeta, err := stack.IsDeployed(context.Background(), cl, app.StackName())
+		deployMeta, err := stack.IsDeployed(context.Background(), cl, 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.Fatal(gotext.Get("%s is already deployed", app.Name))
+			log.Fatalf("%s is already deployed", app.Name)
 		}

-		toDeployVersion, err = getDeployVersion(args, deployMeta, app)
-		if err != nil {
-			log.Fatal(gotext.Get("get deploy version: %s", err))
-		}
-
-		if !internal.Chaos {
-			_, err = app.Recipe.EnsureVersion(toDeployVersion)
+		if !internal.Chaos && specificVersion == "" {
+			versions, err := app.Recipe.Tags()
 			if err != nil {
-				log.Fatal(gotext.Get("ensure recipe: %s", err))
-			}
-		}
-
-		if err := lint.LintForErrors(app.Recipe); err != nil {
-			if internal.Chaos {
-				log.Warn(err)
-			} else {
 				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 err != nil {
+					log.Fatal(err)
+				}
+				toDeployVersion = formatter.SmallSHA(head.String())
+			}
 		}

-		if err := validateSecrets(cl, app); err != nil {
-			log.Fatal(err)
+		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()
+				if err != nil {
+					log.Fatal(err)
+				}
+			}
 		}

 		abraShEnv, err := envfile.ReadAbraShEnvVars(app.Recipe.AbraShPath)
@ -133,7 +194,6 @@ checkout as-is. Recipe commit hashes are also supported as values for
 			log.Fatal(err)
 		}

-		stackName := app.StackName()
 		deployOpts := stack.Deploy{
 			Composefiles: composeFiles,
 			Namespace:    stackName,
@ -149,11 +209,8 @@ 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)
-		if internal.Chaos {
-			appPkg.SetChaosVersionLabel(compose, stackName, toDeployVersion)
-		}
+		appPkg.SetChaosVersionLabel(compose, stackName, toDeployChaosVersion)
 		appPkg.SetUpdateLabel(compose, stackName, app.Env)
-		appPkg.SetVersionLabel(compose, stackName, toDeployVersion)

 		envVars, err := appPkg.CheckEnv(app)
 		if err != nil {
@ -162,22 +219,23 @@ checkout as-is. Recipe commit hashes are also supported as values for

 		for _, envVar := range envVars {
 			if !envVar.Present {
-				deployWarnMessages = append(deployWarnMessages,
-					gotext.Get("%s missing from %s.env", envVar.Name, app.Domain),
+				warnMessages = append(warnMessages,
+					fmt.Sprintf("env var %s missing from %s.env, present in recipe .env.sample", envVar.Name, app.Domain),
 				)
 			}
 		}

 		if !internal.NoDomainChecks {
-			if domainName, ok := app.Env["DOMAIN"]; ok {
+			domainName, ok := app.Env["DOMAIN"]
+			if ok {
 				if _, err = dns.EnsureDomainsResolveSameIPv4(domainName, app.Server); err != nil {
 					log.Fatal(err)
 				}
 			} else {
-				log.Debug(gotext.Get("skipping domain checks, no DOMAIN=... configured"))
+				log.Debug("skipping domain checks as no DOMAIN=... configured for app")
 			}
 		} else {
-			log.Debug(gotext.Get("skipping domain checks"))
+			log.Debug("skipping domain checks as requested")
 		}

 		deployedVersion := config.NO_VERSION_DEFAULT
@ -187,11 +245,11 @@ checkout as-is. Recipe commit hashes are also supported as values for

 		if err := internal.DeployOverview(
 			app,
+			warnMessages,
 			deployedVersion,
+			deployMeta.ChaosVersion,
 			toDeployVersion,
-			"",
-			deployWarnMessages,
-		); err != nil {
+			toDeployChaosVersion); err != nil {
 			log.Fatal(err)
 		}

@ -199,125 +257,45 @@ checkout as-is. Recipe commit hashes are also supported as values for
 		if err != nil {
 			log.Fatal(err)
 		}
+		log.Debugf("set waiting timeout to %d s", stack.WaitTimeout)

-		log.Debug(gotext.Get("set waiting timeout to %d second(s)", stack.WaitTimeout))
-
-		serviceNames, err := appPkg.GetAppServiceNames(app.Name)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		f, err := app.Filters(true, false, serviceNames...)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		if err := stack.RunDeploy(
-			cl,
-			deployOpts,
-			compose,
-			app.Name,
-			app.Server,
-			internal.DontWaitConverge,
-			f,
-		); err != nil {
+		if err := stack.RunDeploy(cl, deployOpts, compose, app.Name, internal.DontWaitConverge); err != nil {
 			log.Fatal(err)
 		}

 		postDeployCmds, ok := app.Env["POST_DEPLOY_CMDS"]
 		if ok && !internal.DontWaitConverge {
-			log.Debug(gotext.Get("run the following post-deploy commands: %s", postDeployCmds))
+			log.Debugf("run the following post-deploy commands: %s", postDeployCmds)
 			if err := internal.PostCmds(cl, app, postDeployCmds); err != nil {
-				log.Fatal(gotext.Get("attempting to run post deploy commands, saw: %s", err))
+				log.Fatalf("attempting to run post deploy commands, saw: %s", err)
 			}
 		}

-		if err := app.WriteRecipeVersion(toDeployVersion, false); err != nil {
-			log.Fatal(gotext.Get("writing recipe version failed: %s", err))
+		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)
 		}
 	},
 }

-func getLatestVersionOrCommit(app app.App) (string, error) {
-	versions, err := app.Recipe.Tags()
-	if err != nil {
-		return "", 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")
 	}
-
-	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
+	return true, nil
 }

-// validateArgsAndFlags ensures compatible args/flags.
-func validateArgsAndFlags(args []string) error {
-	if len(args) == 2 && args[1] != "" && internal.Chaos {
-		return errors.New(gotext.Get("cannot use [version] and --chaos together"))
+// getSpecifiedVersion retrieves the specific version if available
+func getSpecifiedVersion(args []string) string {
+	if len(args) >= 2 {
+		return args[1]
 	}
-
-	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 errors.New(gotext.Get("secret not generated: %s", secStat.LocalName))
-		}
-	}
-
-	return nil
-}
-
-func getDeployVersion(cliArgs []string, deployMeta stack.DeployMeta, app app.App) (string, error) {
-	// Chaos mode overrides everything
-	if internal.Chaos {
-		v, err := app.Recipe.ChaosVersion()
-		if err != nil {
-			return "", err
-		}
-		log.Debug(gotext.Get("version: taking chaos version: %s", v))
-		return v, nil
-	}
-
-	// Check if the deploy version is set with a cli argument
-	if len(cliArgs) == 2 && cliArgs[1] != "" {
-		log.Debug(gotext.Get("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 {
-		if strings.HasSuffix(app.Recipe.EnvVersionRaw, "+U") {
-			return "", errors.New(gotext.Get("version: can not redeploy chaos version %s", app.Recipe.EnvVersionRaw))
-		}
-		log.Debug(gotext.Get("version: taking version from .env file: %s", app.Recipe.EnvVersion))
-		return app.Recipe.EnvVersion, nil
-	}
-
-	// Take deployed version
-	if deployMeta.IsDeployed {
-		log.Debug(gotext.Get("version: taking deployed version: %s", deployMeta.Version))
-		return deployMeta.Version, nil
-	}
-
-	v, err := getLatestVersionOrCommit(app)
-	log.Debug(gotext.Get("version: taking new recipe version: %s", v))
-	if err != nil {
-		return "", err
-	}
-	return v, nil
+	return ""
 }

 func init() {
@ -326,7 +304,7 @@ func init() {
 		"chaos",
 		"C",
 		false,
-		gotext.Get("ignore uncommitted recipes changes"),
+		"ignore uncommitted recipes changes",
 	)

 	AppDeployCommand.Flags().BoolVarP(
@ -334,7 +312,7 @@ func init() {
 		"force",
 		"f",
 		false,
-		gotext.Get("perform action without further prompt"),
+		"perform action without further prompt",
 	)

 	AppDeployCommand.Flags().BoolVarP(
@ -342,7 +320,7 @@ func init() {
 		"no-domain-checks",
 		"D",
 		false,
-		gotext.Get("disable public DNS checks"),
+		"disable public DNS checks",
 	)

 	AppDeployCommand.Flags().BoolVarP(
@ -350,6 +328,6 @@ func init() {
 		"no-converge-checks",
 		"c",
 		false,
-		gotext.Get("disable converge logic checks"),
+		"do not wait for converge logic checks",
 	)
 }
--- a/cli/app/deploy_test.go
+++ b/cli/app/deploy_test.go
@ -0,0 +1,57 @@
+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,
+			)
+		}
+	}
+}
--- a/cli/app/diff.go
+++ b/cli/app/diff.go
@ -0,0 +1,51 @@
+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)
+		}
+	},
+}
--- a/cli/app/env.go
+++ b/cli/app/env.go
@ -1,43 +0,0 @@
-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)
-	},
-}
--- a/cli/app/labels.go
+++ b/cli/app/labels.go
@ -1,139 +0,0 @@
-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",
-	)
-}
--- a/cli/app/list.go
+++ b/cli/app/list.go
@ -13,7 +13,6 @@ import (
 	"coopcloud.tech/abra/pkg/formatter"
 	"coopcloud.tech/abra/pkg/log"
 	"coopcloud.tech/tagcmp"
-	"github.com/leonelquinteros/gotext"
 	"github.com/spf13/cobra"
 )

@ -40,20 +39,20 @@ type serverStatus struct {
 }

 var AppListCommand = &cobra.Command{
-	Use:     gotext.Get("list [flags]"),
+	Use:     "list [flags]",
 	Aliases: []string{"ls"},
-	Short:   gotext.Get("List all managed apps"),
-	Long: gotext.Get(`Generate a report of all managed apps.
+	Short:   "List all managed apps",
+	Long: `Generate a report of all managed apps.

-Use "--status/-S" flag to query all servers for the live deployment status.`),
-	Example: gotext.Get(`  # list apps of all servers without live status
+Use "--status/-S" flag to query all servers for the live deployment status.`,
+	Example: `  # list apps of all servers without live status
  abra app ls

  # list apps of a specific server with live status
  abra app ls -s 1312.net -S

  # list apps of all servers which match a specific recipe
-  abra app ls -r gitea`),
+  abra app ls -r gitea`,
 	Args: cobra.NoArgs,
 	Run: func(cmd *cobra.Command, args []string) {
 		appFiles, err := appPkg.LoadAppFiles(listAppServer)
@ -143,14 +142,10 @@ Use "--status/-S" flag to query all servers for the live deployment status.`),
 					appStats.AutoUpdate = autoUpdate

 					var newUpdates []string
-					if version != "unknown" && chaos == "false" {
-						if err := app.Recipe.EnsureExists(); err != nil {
-							log.Fatal(gotext.Get("unable to clone %s: %s", app.Name, err))
-						}
-
+					if version != "unknown" {
 						updates, err := app.Recipe.Tags()
 						if err != nil {
-							log.Fatal(gotext.Get("unable to retrieve tags for %s: %s", app.Name, err))
+							log.Fatal(err)
 						}

 						parsedVersion, err := tagcmp.Parse(version)
@ -216,12 +211,11 @@ Use "--status/-S" flag to query all servers for the live deployment status.`),
 			headers := []string{"RECIPE", "DOMAIN", "SERVER"}
 			if status {
 				headers = append(headers, []string{
-					gotext.Get("STATUS"),
-					gotext.Get("CHAOS"),
-					gotext.Get("VERSION"),
-					gotext.Get("UPGRADE"),
-					gotext.Get("AUTOUPDATE"),
-				}...,
+					"STATUS",
+					"CHAOS",
+					"VERSION",
+					"UPGRADE",
+					"AUTOUPDATE"}...,
 				)
 			}

@ -288,7 +282,7 @@ func init() {
 		"status",
 		"S",
 		false,
-		gotext.Get("show app deployment status"),
+		"show app deployment status",
 	)

 	AppListCommand.Flags().StringVarP(
@ -296,7 +290,7 @@ func init() {
 		"recipe",
 		"r",
 		"",
-		gotext.Get("show apps of a specific recipe"),
+		"show apps of a specific recipe",
 	)

 	AppListCommand.RegisterFlagCompletionFunc(
@ -311,7 +305,7 @@ func init() {
 		"machine",
 		"m",
 		false,
-		gotext.Get("print machine-readable output"),
+		"print machine-readable output",
 	)

 	AppListCommand.Flags().StringVarP(
@ -319,7 +313,7 @@ func init() {
 		"server",
 		"s",
 		"",
-		gotext.Get("show apps of a specific server"),
+		"show apps of a specific server",
 	)

 	AppListCommand.RegisterFlagCompletionFunc(
--- a/cli/app/logs.go
+++ b/cli/app/logs.go
@ -3,19 +3,28 @@ package app
 import (
 	"context"
 	"fmt"
+	"io"
+	"os"
+	"slices"
+	"sync"
+	"time"

 	"coopcloud.tech/abra/cli/internal"
 	appPkg "coopcloud.tech/abra/pkg/app"
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/client"
 	"coopcloud.tech/abra/pkg/log"
-	"coopcloud.tech/abra/pkg/logs"
 	"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 <domain> [service] [flags]",
+	Use:     "logs <app> [service] [flags]",
 	Aliases: []string{"l"},
 	Short:   "Tail app logs",
 	Args:    cobra.RangeArgs(1, 2),
@ -64,25 +73,80 @@ var AppLogsCommand = &cobra.Command{
 			serviceNames = []string{args[1]}
 		}

-		f, err := app.Filters(true, false, serviceNames...)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		opts := logs.TailOpts{
-			AppName:  app.Name,
-			Services: serviceNames,
-			StdErr:   stdErr,
-			Since:    sinceLogs,
-			Filters:  f,
-		}
-
-		if err := logs.TailLogs(cl, opts); err != nil {
+		if err = tailLogs(cl, app, serviceNames); 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
--- a/cli/app/new.go
+++ b/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 <domain>" to do so.
+deploy <app>" to do so.

 You can see what recipes are available (i.e. values for the [recipe] argument)
 by running "abra recipe ls".
@ -75,49 +75,42 @@ var AppNewCommand = &cobra.Command{

 		chaosVersion := config.CHAOS_DEFAULT
 		if internal.Chaos {
-			var err error
-			chaosVersion, err = recipe.ChaosVersion()
-			if err != nil {
-				log.Fatal(err)
-			}
-
 			recipeVersion = chaosVersion
-		} else {
+
+			if !internal.Offline {
+				if err := recipe.EnsureUpToDate(); err != nil {
+					log.Fatal(err)
+				}
+			}
+		}
+
+		if !internal.Chaos {
 			if err := recipe.EnsureIsClean(); err != nil {
 				log.Fatal(err)
 			}
+		}

-			var recipeVersions recipePkg.RecipeVersions
-			if recipeVersion == "" {
-				var err error
-				recipeVersions, _, err = recipe.GetRecipeVersions()
-				if err != nil {
-					log.Fatal(err)
-				}
+		var recipeVersions recipePkg.RecipeVersions
+		if recipeVersion == "" {
+			var err error
+			recipeVersions, err = recipe.GetRecipeVersions()
+			if err != nil {
+				log.Fatal(err)
+			}
+		}
+
+		if len(recipeVersions) > 0 {
+			latest := recipeVersions[len(recipeVersions)-1]
+			for tag := range latest {
+				recipeVersion = tag
 			}

-			if len(recipeVersions) > 0 {
-				latest := recipeVersions[len(recipeVersions)-1]
-				for tag := range latest {
-					recipeVersion = tag
-				}
-
-				if _, err := recipe.EnsureVersion(recipeVersion); err != nil {
-					log.Fatal(err)
-				}
-			} else {
-				if err := recipe.EnsureLatest(); err != nil {
-					log.Fatal(err)
-				}
-
-				if recipeVersion == "" {
-					head, err := recipe.Head()
-					if err != nil {
-						log.Fatalf("failed to retrieve latest commit for %s: %s", recipe.Name, err)
-					}
-
-					recipeVersion = formatter.SmallSHA(head.String())
-				}
+			if _, err := recipe.EnsureVersion(recipeVersion); err != nil {
+				log.Fatal(err)
+			}
+		} else {
+			if err := recipe.EnsureLatest(); err != nil {
+				log.Fatal(err)
 			}
 		}

@ -194,7 +187,7 @@ var AppNewCommand = &cobra.Command{
 			newAppServer = "local"
 		}

-		log.Infof("%s created (version: %s)", appDomain, recipeVersion)
+		log.Infof("%s created successfully (version: %s, chaos: %s)", appDomain, recipeVersion, chaosVersion)

 		if len(appSecrets) > 0 {
 			rows := [][]string{}
@ -208,8 +201,8 @@ var AppNewCommand = &cobra.Command{

 			log.Warnf(
 				"secrets are %s shown again, please save them %s",
-				formatter.BoldUnderlineStyle.Render("NOT"),
-				formatter.BoldUnderlineStyle.Render("NOW"),
+				formatter.BoldStyle.Render("NOT"),
+				formatter.BoldStyle.Render("NOW"),
 			)
 		}

@ -218,8 +211,9 @@ 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 recipe version failed: %s", err)
+			log.Fatalf("writing new recipe version in env file: %s", err)
 		}
 	},
 }
@ -302,12 +296,6 @@ func ensureServerFlag() error {
 		return err
 	}

-	if len(servers) == 1 {
-		newAppServer = servers[0]
-		log.Infof("single server detected, choosing %s automatically", newAppServer)
-		return nil
-	}
-
 	if newAppServer == "" && !internal.NoInput {
 		prompt := &survey.Select{
 			Message: "Select app server:",
--- a/cli/app/ps.go
+++ b/cli/app/ps.go
@ -4,8 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"sort"
-	"strings"

 	"coopcloud.tech/abra/cli/internal"
 	appPkg "coopcloud.tech/abra/pkg/app"
@ -24,9 +22,9 @@ import (
 )

 var AppPsCommand = &cobra.Command{
-	Use:     "ps <domain> [flags]",
+	Use:     "ps <app> [flags]",
 	Aliases: []string{"p"},
-	Short:   "Check app deployment status",
+	Short:   "Check app status",
 	Args:    cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@ -37,7 +35,7 @@ var AppPsCommand = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		app := internal.ValidateApp(args)

-		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
+		if err := app.Recipe.Ensure(internal.Chaos, internal.Offline); err != nil {
 			log.Fatal(err)
 		}

@ -59,11 +57,9 @@ 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" {
-				if cVersion, exists := statusMeta["chaosVersion"]; exists {
-					chaosVersion = cVersion
-					if strings.HasSuffix(chaosVersion, config.DIRTY_DEFAULT) {
-						chaosVersion = formatter.BoldDirtyDefault(chaosVersion)
-					}
+				chaosVersion, err = app.Recipe.ChaosVersion()
+				if err != nil {
+					log.Fatal(err)
 				}
 			}
 		}
@ -92,14 +88,9 @@ func showPSOutput(app appPkg.App, cl *dockerClient.Client, deployedVersion, chao
 		return
 	}

-	services := compose.Services
-	sort.Slice(services, func(i, j int) bool {
-		return services[i].Name < services[j].Name
-	})
-
 	var rows [][]string
 	allContainerStats := make(map[string]map[string]string)
-	for _, service := range services {
+	for _, service := range compose.Services {
 		filters := filters.NewArgs()
 		filters.Add("name", fmt.Sprintf("^%s_%s", app.StackName(), service.Name))

@ -149,10 +140,10 @@ func showPSOutput(app appPkg.App, cl *dockerClient.Client, deployedVersion, chao

 		row := []string{
 			containerStats["service"],
-			containerStats["status"],
 			containerStats["image"],
 			dVersion,
 			cVersion,
+			containerStats["status"],
 		}

 		rows = append(rows, row)
@ -176,10 +167,10 @@ func showPSOutput(app appPkg.App, cl *dockerClient.Client, deployedVersion, chao

 	headers := []string{
 		"SERVICE",
-		"STATUS",
 		"IMAGE",
 		"VERSION",
 		"CHAOS",
+		"STATUS",
 	}

 	table.
--- a/cli/app/push.go
+++ b/cli/app/push.go
@ -0,0 +1,110 @@
+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",
+	)
+}
--- a/cli/app/remove.go
+++ b/cli/app/remove.go
@ -9,14 +9,14 @@ import (
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/client"
 	"coopcloud.tech/abra/pkg/log"
-	"coopcloud.tech/abra/pkg/upstream/stack"
+	stack "coopcloud.tech/abra/pkg/upstream/stack"
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/docker/docker/api/types"
 	"github.com/spf13/cobra"
 )

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

-		configs, err := client.GetConfigs(cl, context.Background(), app.Server, fs)
-		if err != nil {
-			log.Fatal(err)
-		}
-		configNames := client.GetConfigNames(configs)
-
-		if len(configNames) > 0 {
-			if err := client.RemoveConfigs(cl, context.Background(), configNames, internal.Force); err != nil {
-				log.Fatalf("removing configs failed: %s", err)
-			}
-
-			log.Infof("%d config(s) removed successfully", len(configNames))
-		} else {
-			log.Info("no configs to remove")
-		}
-
 		secretList, err := cl.SecretList(context.Background(), types.SecretListOptions{Filters: fs})
 		if err != nil {
 			log.Fatal(err)
@ -136,7 +120,7 @@ flag.`,
 				log.Fatalf("removing volumes failed: %s", err)
 			}

-			log.Infof("%d volume(s) removed successfully", len(volumeNames))
+			log.Infof("%d volumes removed successfully", len(volumeNames))
 		} else {
 			log.Info("no volumes to remove")
 		}
--- a/cli/app/restart.go
+++ b/cli/app/restart.go
@ -9,20 +9,18 @@ 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/docker/docker/api/types"
 	"github.com/spf13/cobra"
 )

 var AppRestartCommand = &cobra.Command{
-	Use:     "restart <domain> [[service] | --all-services] [flags]",
+	Use:     "restart <app> [[service] | --all-services] [flags]",
 	Aliases: []string{"re"},
 	Short:   "Restart an app",
 	Long: `This command restarts services within a deployed app.

-Run "abra app ps <domain>" to see a list of service names.
+Run "abra app ps <app>" to see a list of service names.

 Pass "--all-services/-a" to restart all services.`,
 	Example: `  # restart a single app service
@ -50,7 +48,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(internal.GetEnsureContext()); err != nil {
+		if err := app.Recipe.Ensure(false, false); err != nil {
 			log.Fatal(err)
 		}

@ -95,36 +93,13 @@ Pass "--all-services/-a" to restart all services.`,
 		for _, serviceName := range serviceNames {
 			stackServiceName := fmt.Sprintf("%s_%s", app.StackName(), serviceName)

-			service, _, err := cl.ServiceInspectWithRaw(
-				context.Background(),
-				stackServiceName,
-				types.ServiceInspectOptions{},
-			)
-			if err != nil {
-				log.Fatal(err)
-			}
-
 			log.Debugf("attempting to scale %s to 0", stackServiceName)

 			if err := upstream.RunServiceScale(context.Background(), cl, stackServiceName, 0); err != nil {
 				log.Fatal(err)
 			}

-			f, err := app.Filters(true, false, serviceName)
-			if err != nil {
-				log.Fatal(err)
-			}
-
-			waitOpts := stack.WaitOpts{
-				Services:   []ui.ServiceMeta{{Name: stackServiceName, ID: service.ID}},
-				AppName:    app.Name,
-				ServerName: app.Server,
-				Filters:    f,
-				NoLog:      true,
-				Quiet:      true,
-			}
-
-			if err := stack.WaitOnServices(cmd.Context(), cl, waitOpts); err != nil {
+			if err := stack.WaitOnService(context.Background(), cl, stackServiceName, app.Name); err != nil {
 				log.Fatal(err)
 			}

@ -135,7 +110,7 @@ Pass "--all-services/-a" to restart all services.`,
 				log.Fatal(err)
 			}

-			if err := stack.WaitOnServices(cmd.Context(), cl, waitOpts); err != nil {
+			if err := stack.WaitOnService(context.Background(), cl, stackServiceName, app.Name); err != nil {
 				log.Fatal(err)
 			}

@ -148,13 +123,6 @@ 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",
--- a/cli/app/restore.go
+++ b/cli/app/restore.go
@ -12,7 +12,7 @@ import (
 )

 var AppRestoreCommand = &cobra.Command{
-	Use:     "restore <domain> [flags]",
+	Use:     "restore <app> [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.GetEnsureContext()); err != nil {
+		if err := app.Recipe.Ensure(internal.Chaos, internal.Offline); err != nil {
 			log.Fatal(err)
 		}

--- a/cli/app/rollback.go
+++ b/cli/app/rollback.go
@ -1,14 +1,13 @@
 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"
@ -21,23 +20,16 @@ import (
 )

 var AppRollbackCommand = &cobra.Command{
-	Use:     "rollback <domain> [version] [flags]",
+	Use:     "rollback <app> [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 "abra app deploy", chaos operations are not supported here. Only recipe
-versions are supported values for "[version]".
+Unlike "deploy", chaos operations are not supported here. Only recipe versions
+are supported values for "[<version>]".

-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.`,
+A rollback can be destructive, please ensure you have a copy of your app data
+beforehand.`,
 	Example: ` # standard rollback
  abra app rollback 1312.net

@ -63,15 +55,26 @@ beforehand. See "abra app backup" for more.`,
 		}
 	},
 	Run: func(cmd *cobra.Command, args []string) {
-		var (
-			downgradeWarnMessages []string
-			chosenDowngrade       string
-			availableDowngrades   []string
-		)
+		var warnMessages []string

 		app := internal.ValidateApp(args)
+		stackName := app.StackName()

-		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
+		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 {
 			log.Fatal(err)
 		}

@ -80,13 +83,15 @@ beforehand. See "abra app backup" for more.`,
 			log.Fatal(err)
 		}

-		deployMeta, err := ensureDeployed(cl, app)
+		log.Debugf("checking whether %s is already deployed", stackName)
+
+		deployMeta, err := stack.IsDeployed(context.Background(), cl, stackName)
 		if err != nil {
 			log.Fatal(err)
 		}

-		if err := lint.LintForErrors(app.Recipe); err != nil {
-			log.Fatal(err)
+		if !deployMeta.IsDeployed {
+			log.Fatalf("%s is not deployed?", app.Name)
 		}

 		versions, err := app.Recipe.Tags()
@ -94,56 +99,84 @@ beforehand. See "abra app backup" for more.`,
 			log.Fatal(err)
 		}

-		// 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 {
+		var availableDowngrades []string
+		if deployMeta.Version == "unknown" {
 			availableDowngrades = versions
+			warnMessages = append(warnMessages, fmt.Sprintf("failed to determine deployed version of %s", app.Name))
 		}

-		if len(args) == 2 && args[1] != "" {
-			chosenDowngrade = args[1]
-
-			if err := validateDowngradeVersionArg(chosenDowngrade, app, deployMeta); err != nil {
-				log.Fatal(err)
-			}
-
-			availableDowngrades = append(availableDowngrades, chosenDowngrade)
-		}
-
-		if deployMeta.Version != config.UNKNOWN_DEFAULT && chosenDowngrade == "" {
-			downgradeAvailable, err := ensureDowngradesAvailable(versions, &availableDowngrades, deployMeta)
+		if specificVersion != "" {
+			parsedDeployedVersion, err := tagcmp.Parse(deployMeta.Version)
 			if err != nil {
-				log.Fatal(err)
+				log.Fatalf("'%s' is not a known version for %s", deployMeta.Version, app.Recipe.Name)
 			}

-			if !downgradeAvailable {
+			parsedSpecificVersion, err := tagcmp.Parse(specificVersion)
+			if err != nil {
+				log.Fatalf("'%s' is not a known version for %s", specificVersion, app.Recipe.Name)
+			}
+
+			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 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 {
 				log.Info("no available downgrades")
 				return
 			}
 		}

-		if internal.Force || internal.NoInput || chosenDowngrade != "" {
-			if len(availableDowngrades) > 0 {
+		var chosenDowngrade string
+		if len(availableDowngrades) > 0 {
+			if internal.Force || internal.NoInput || specificVersion != "" {
 				chosenDowngrade = availableDowngrades[len(availableDowngrades)-1]
-			}
-		} else {
-			if err := chooseDowngrade(availableDowngrades, deployMeta, &chosenDowngrade); err != nil {
-				log.Fatal(err)
-			}
-		}
+				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 internal.Force &&
-			chosenDowngrade == "" &&
-			deployMeta.Version != config.UNKNOWN_DEFAULT {
-			chosenDowngrade = deployMeta.Version
-		}
+				prompt := &survey.Select{
+					Message: msg,
+					Options: internal.SortVersionsDesc(availableDowngrades),
+				}

-		if chosenDowngrade == "" {
-			log.Fatal("unknown deployed version, unable to downgrade")
+				if err := survey.AskOne(prompt, &chosenDowngrade); err != nil {
+					return
+				}
+			}
 		}

 		log.Debugf("choosing %s as version to rollback", chosenDowngrade)
-
 		if _, err := app.Recipe.EnsureVersion(chosenDowngrade); err != nil {
 			log.Fatal(err)
 		}
@ -161,7 +194,6 @@ beforehand. See "abra app backup" for more.`,
 			log.Fatal(err)
 		}

-		stackName := app.StackName()
 		deployOpts := stack.Deploy{
 			Composefiles: composeFiles,
 			Namespace:    stackName,
@ -178,143 +210,36 @@ beforehand. See "abra app backup" for more.`,
 		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.SetChaosVersionLabel(compose, stackName, chosenDowngrade)
 		appPkg.SetUpdateLabel(compose, stackName, app.Env)

+		chaosVersion := config.CHAOS_DEFAULT
+		if deployMeta.IsChaos {
+			chaosVersion = deployMeta.ChaosVersion
+		}
+
 		// NOTE(d1): no release notes implemeneted for rolling back
-		if err := internal.DeployOverview(
+		if err := internal.NewVersionOverview(
 			app,
-			deployMeta.Version,
-			chosenDowngrade,
-			"",
-			downgradeWarnMessages,
-		); err != nil {
-			log.Fatal(err)
-		}
-
-		stack.WaitTimeout, err = appPkg.GetTimeoutFromLabel(compose, stackName)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		log.Debugf("set waiting timeout to %d second(s)", stack.WaitTimeout)
-
-		serviceNames, err := appPkg.GetAppServiceNames(app.Name)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		f, err := app.Filters(true, false, serviceNames...)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		if err := stack.RunDeploy(
-			cl,
-			deployOpts,
-			compose,
-			stackName,
-			app.Server,
-			internal.DontWaitConverge,
-			f,
-		); err != nil {
-			log.Fatal(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):",
+			warnMessages,
+			"rollback",
 			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("current deployment '%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
+			chosenDowngrade,
+			""); err != nil {
+			log.Fatal(err)
 		}

-		if parsedVersion.IsLessThan(parsedDeployedVersion) &&
-			!(parsedVersion.Equals(parsedDeployedVersion)) {
-			*availableDowngrades = append(*availableDowngrades, version)
+		if err := stack.RunDeploy(cl, deployOpts, compose, stackName, internal.DontWaitConverge); err != nil {
+			log.Fatal(err)
 		}
-	}

-	if len(*availableDowngrades) == 0 && !internal.Force {
-		return false, nil
-	}
-
-	return true, nil
+		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)
+		}
+	},
 }

 func init() {
@ -338,6 +263,6 @@ func init() {
 		&internal.DontWaitConverge, "no-converge-checks",
 		"c",
 		false,
-		"disable converge logic checks",
+		"do not wait for converge logic checks",
 	)
 }
--- a/cli/app/run.go
+++ b/cli/app/run.go
@ -11,13 +11,13 @@ import (
 	"coopcloud.tech/abra/pkg/log"
 	"coopcloud.tech/abra/pkg/upstream/container"
 	"github.com/docker/cli/cli/command"
-	containertypes "github.com/docker/docker/api/types/container"
+	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/spf13/cobra"
 )

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

 		userCmd := args[2:]
-		execCreateOpts := containertypes.ExecOptions{
+		execCreateOpts := types.ExecConfig{
 			AttachStderr: true,
 			AttachStdin:  true,
 			AttachStdout: true,
--- a/cli/app/secret.go
+++ b/cli/app/secret.go
@ -20,7 +20,7 @@ import (
 )

 var AppSecretGenerateCommand = &cobra.Command{
-	Use:     "generate <domain> [[secret] [version] | --all] [flags]",
+	Use:     "generate <app> [[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.GetEnsureContext()); err != nil {
+		if err := app.Recipe.Ensure(internal.Chaos, internal.Offline); err != nil {
 			log.Fatal(err)
 		}

-		if len(args) <= 2 && !generateAllSecrets {
+		if len(args) == 1 && !generateAllSecrets {
 			log.Fatal("missing arguments [secret]/[version] or '--all'")
 		}

-		if len(args) > 2 && generateAllSecrets {
+		if len(args) > 1 && generateAllSecrets {
 			log.Fatal("cannot use '[secret] [version]' and '--all' together")
 		}

@ -140,22 +140,14 @@ var AppSecretGenerateCommand = &cobra.Command{
 }

 var AppSecretInsertCommand = &cobra.Command{
-	Use:     "insert <domain> <secret> <version> <data> [flags]",
+	Use:     "insert <app> <secret> <version> <data> [flags]",
 	Aliases: []string{"i"},
 	Short:   "Insert secret",
 	Long: `This command inserts a secret into an app environment.

-Arbitrary secret insertion is not supported. Secrets that are inserted must
-match those configured in the recipe beforehand.
-
 This can be useful when you want to manually generate secrets for an app
 environment. Typically, you can let Abra generate them for you on app creation
 (see "abra app new --secrets/-S" for more).`,
-	Example: `  # insert regular secret
-  abra app secret insert 1312.net my_secret v1 mySuperSecret
-
-  # insert secret as file
-  abra app secret insert 1312.net my_secret v1 secret.txt -f`,
 	Args: cobra.MinimumNArgs(4),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@ -178,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.GetEnsureContext()); err != nil {
+		if err := app.Recipe.Ensure(internal.Chaos, internal.Offline); err != nil {
 			log.Fatal(err)
 		}

@ -191,26 +183,6 @@ environment. Typically, you can let Abra generate them for you on app creation
 		version := args[2]
 		data := args[3]

-		composeFiles, err := app.Recipe.GetComposeFiles(app.Env)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		secrets, err := secret.ReadSecretsConfig(app.Path, composeFiles, app.StackName())
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		var isRecipeSecret bool
-		for secretName := range secrets {
-			if secretName == name {
-				isRecipeSecret = true
-			}
-		}
-		if !isRecipeSecret {
-			log.Fatalf("no secret %s available for recipe %s?", name, app.Recipe.Name)
-		}
-
 		if insertFromFile {
 			raw, err := os.ReadFile(data)
 			if err != nil {
@ -258,14 +230,9 @@ func secretRm(cl *dockerClient.Client, app appPkg.App, secretName, parsed string
 }

 var AppSecretRmCommand = &cobra.Command{
-	Use:     "remove <domain> [[secret] | --all] [flags]",
+	Use:     "remove <app> [[secret] | --all] [flags]",
 	Aliases: []string{"rm"},
 	Short:   "Remove a secret",
-	Long: `This command removes a secret from an app environment.
-
-Arbitrary secret removal is not supported. Secrets that are removed must
-match those configured in the recipe beforehand.`,
-	Example: "  abra app secret rm 1312.net oauth_key",
 	Args:    cobra.RangeArgs(1, 2),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@ -291,7 +258,7 @@ match those configured in the recipe beforehand.`,
 	Run: func(cmd *cobra.Command, args []string) {
 		app := internal.ValidateApp(args)

-		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
+		if err := app.Recipe.Ensure(internal.Chaos, internal.Offline); err != nil {
 			log.Fatal(err)
 		}

@ -371,7 +338,7 @@ match those configured in the recipe beforehand.`,
 }

 var AppSecretLsCommand = &cobra.Command{
-	Use:     "list <domain>",
+	Use:     "list <app>",
 	Aliases: []string{"ls"},
 	Short:   "List all secrets",
 	Args:    cobra.MinimumNArgs(1),
@ -384,7 +351,7 @@ var AppSecretLsCommand = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		app := internal.ValidateApp(args)

-		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
+		if err := app.Recipe.Ensure(internal.Chaos, internal.Offline); err != nil {
 			log.Fatal(err)
 		}

--- a/cli/app/services.go
+++ b/cli/app/services.go
@ -17,7 +17,7 @@ import (
 )

 var AppServicesCommand = &cobra.Command{
-	Use:     "services <domain> [flags]",
+	Use:     "services <app> [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.GetEnsureContext()); err != nil {
+		if err := app.Recipe.Ensure(internal.Chaos, internal.Offline); err != nil {
 			log.Fatal(err)
 		}

--- a/cli/app/undeploy.go
+++ b/cli/app/undeploy.go
@ -18,7 +18,7 @@ import (
 )

 var AppUndeployCommand = &cobra.Command{
-	Use:     "undeploy <domain> [flags]",
+	Use:     "undeploy <app> [flags]",
 	Aliases: []string{"un"},
 	Short:   "Undeploy an app",
 	Long: `This does not destroy any application data.
@ -38,10 +38,6 @@ Passing "--prune/-p" does not remove those volumes.`,
 		app := internal.ValidateApp(args)
 		stackName := app.StackName()

-		if err := app.Recipe.EnsureExists(); err != nil {
-			log.Fatal(err)
-		}
-
 		cl, err := client.New(app.Server)
 		if err != nil {
 			log.Fatal(err)
@ -58,36 +54,20 @@ Passing "--prune/-p" does not remove those volumes.`,
 			log.Fatalf("%s is not deployed?", app.Name)
 		}

-		if err := internal.DeployOverview(
+		chaosVersion := config.CHAOS_DEFAULT
+		if deployMeta.IsChaos {
+			chaosVersion = deployMeta.ChaosVersion
+		}
+
+		if err := internal.UndeployOverview(
 			app,
 			deployMeta.Version,
-			config.NO_DOMAIN_DEFAULT,
-			"",
-			nil,
-		); err != nil {
+			chaosVersion); err != nil {
 			log.Fatal(err)
 		}

-		composeFiles, err := app.Recipe.GetComposeFiles(app.Env)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		opts := stack.Deploy{Composefiles: composeFiles, Namespace: stackName}
-		compose, err := appPkg.GetAppComposeConfig(app.Name, opts, app.Env)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		stack.WaitTimeout, err = appPkg.GetTimeoutFromLabel(compose, stackName)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		log.Info("initialising undeploy")
-
 		rmOpts := stack.Remove{
-			Namespaces: []string{stackName},
+			Namespaces: []string{app.StackName()},
 			Detach:     false,
 		}
 		if err := stack.RunRemove(context.Background(), cl, rmOpts); err != nil {
@ -100,10 +80,9 @@ Passing "--prune/-p" does not remove those volumes.`,
 			}
 		}

-		log.Info("undeploy succeeded 🟢")
-
+		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 recipe version failed: %s", err)
+			log.Fatalf("writing undeployed recipe version in env file: %s", err)
 		}
 	},
 }
--- a/cli/app/upgrade.go
+++ b/cli/app/upgrade.go
@ -3,50 +3,37 @@ package app
 import (
 	"context"
 	"fmt"
-	"strings"

 	"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"
-	"coopcloud.tech/abra/pkg/recipe"
 	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 <domain> [version] [flags]",
+	Use:     "upgrade <app> [version] [flags]",
 	Aliases: []string{"up"},
 	Short:   "Upgrade an app",
 	Long: `Upgrade an app.

-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.
+Unlike "deploy", chaos operations are not supported here. Only recipe versions
+are supported values for "[version]".

 An upgrade can be destructive, please ensure you have a copy of your app data
-beforehand. See "abra app backup" for more.`,
+beforehand.`,
 	Args: cobra.RangeArgs(1, 2),
 	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()
@ -62,32 +49,22 @@ beforehand. See "abra app backup" for more.`,
 		}
 	},
 	Run: func(cmd *cobra.Command, args []string) {
-		var (
-			upgradeWarnMessages []string
-			chosenUpgrade       string
-			availableUpgrades   []string
-			upgradeReleaseNotes string
-		)
+		var warnMessages []string

 		app := internal.ValidateApp(args)
+		stackName := app.StackName()

-		if err := app.Recipe.Ensure(recipe.EnsureContext{
-			Chaos:   internal.Chaos,
-			Offline: internal.Offline,
-			// Ignore the env version for now, to make sure we are at the latest commit.
-			// This enables us to get release notes, that were added after a release.
-			IgnoreEnvVersion: true,
-		}); err != nil {
-			log.Fatal(err)
+		var specificVersion string
+		if len(args) == 2 {
+			specificVersion = args[1]
 		}

-		cl, err := client.New(app.Server)
-		if err != nil {
-			log.Fatal(err)
+		if specificVersion != "" {
+			log.Debugf("overriding env file version (%s) with %s", app.Recipe.Version, specificVersion)
+			app.Recipe.Version = specificVersion
 		}

-		deployMeta, err := ensureDeployed(cl, app)
-		if err != nil {
+		if err := app.Recipe.Ensure(internal.Chaos, internal.Offline); err != nil {
 			log.Fatal(err)
 		}

@ -95,68 +72,134 @@ beforehand. See "abra app backup" for more.`,
 			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)
 		}

-		// 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 {
+		var availableUpgrades []string
+		if deployMeta.Version == "unknown" {
 			availableUpgrades = versions
+			warnMessages = append(warnMessages, fmt.Sprintf("failed to determine deployed version of %s", app.Name))
 		}

-		if len(args) == 2 && args[1] != "" {
-			chosenUpgrade = args[1]
-
-			if err := validateUpgradeVersionArg(chosenUpgrade, app, deployMeta); err != nil {
-				log.Fatal(err)
-			}
-
-			availableUpgrades = append(availableUpgrades, chosenUpgrade)
-		}
-
-		if deployMeta.Version != config.UNKNOWN_DEFAULT && chosenUpgrade == "" {
-			upgradeAvailable, err := ensureUpgradesAvailable(app, versions, &availableUpgrades, deployMeta)
+		if specificVersion != "" {
+			parsedDeployedVersion, err := tagcmp.Parse(deployMeta.Version)
 			if err != nil {
-				log.Fatal(err)
+				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 !upgradeAvailable {
+			if parsedSpecificVersion.IsLessThan(parsedDeployedVersion) && !parsedSpecificVersion.Equals(parsedDeployedVersion) {
+				log.Fatalf("%s is not an upgrade for %s?", deployMeta.Version, specificVersion)
+			}
+
+			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 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 {
 				log.Info("no available upgrades")
 				return
 			}
 		}

-		if internal.Force || internal.NoInput || chosenUpgrade != "" {
-			if len(availableUpgrades) > 0 {
+		var chosenUpgrade string
+		if len(availableUpgrades) > 0 {
+			if internal.Force || internal.NoInput || specificVersion != "" {
 				chosenUpgrade = availableUpgrades[len(availableUpgrades)-1]
-			}
-		} else {
-			if err := chooseUpgrade(availableUpgrades, deployMeta, &chosenUpgrade); err != nil {
-				log.Fatal(err)
+				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 internal.Force &&
-			chosenUpgrade == "" &&
-			deployMeta.Version != config.UNKNOWN_DEFAULT {
+		if internal.Force && chosenUpgrade == "" {
+			warnMessages = append(warnMessages, fmt.Sprintf("%s is already upgraded to latest", app.Name))
 			chosenUpgrade = deployMeta.Version
 		}

-		if chosenUpgrade == "" {
-			log.Fatal("unknown deployed version, unable to upgrade")
+		// 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)
+					}
+				}
+			}
 		}

 		log.Debugf("choosing %s as version to upgrade", chosenUpgrade)
-
-		// Get the release notes before checking out the new version in the
-		// recipe. This enables us to get release notes, that were added after
-		// a release.
-		if err := getReleaseNotes(app, versions, chosenUpgrade, deployMeta, &upgradeReleaseNotes); err != nil {
-			log.Fatal(err)
-		}
-
 		if _, err := app.Recipe.EnsureVersion(chosenUpgrade); err != nil {
 			log.Fatal(err)
 		}
@ -174,7 +217,6 @@ beforehand. See "abra app backup" for more.`,
 			log.Fatal(err)
 		}

-		stackName := app.StackName()
 		deployOpts := stack.Deploy{
 			Composefiles: composeFiles,
 			Namespace:    stackName,
@ -191,9 +233,7 @@ beforehand. See "abra app backup" for more.`,
 		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.SetChaosVersionLabel(compose, stackName, chosenUpgrade)
 		appPkg.SetUpdateLabel(compose, stackName, app.Env)

 		envVars, err := appPkg.CheckEnv(app)
@ -203,31 +243,30 @@ beforehand. See "abra app backup" for more.`,

 		for _, envVar := range envVars {
 			if !envVar.Present {
-				upgradeWarnMessages = append(upgradeWarnMessages,
-					fmt.Sprintf("%s missing from %s.env", envVar.Name, app.Domain),
+				warnMessages = append(warnMessages,
+					fmt.Sprintf("env var %s missing from %s.env, present in recipe .env.sample", envVar.Name, app.Domain),
 				)
 			}
 		}

 		if showReleaseNotes {
-			fmt.Print(upgradeReleaseNotes)
+			fmt.Print(releaseNotes)
 			return
 		}

-		if upgradeReleaseNotes == "" {
-			upgradeWarnMessages = append(
-				upgradeWarnMessages,
-				fmt.Sprintf("no release notes available for %s", chosenUpgrade),
-			)
+		chaosVersion := config.CHAOS_DEFAULT
+		if deployMeta.IsChaos {
+			chaosVersion = deployMeta.ChaosVersion
 		}

-		if err := internal.DeployOverview(
+		if err := internal.NewVersionOverview(
 			app,
+			warnMessages,
+			"upgrade",
 			deployMeta.Version,
+			chaosVersion,
 			chosenUpgrade,
-			upgradeReleaseNotes,
-			upgradeWarnMessages,
-		); err != nil {
+			releaseNotes); err != nil {
 			log.Fatal(err)
 		}

@ -235,197 +274,31 @@ beforehand. See "abra app backup" for more.`,
 		if err != nil {
 			log.Fatal(err)
 		}
+		log.Debugf("set waiting timeout to %d s", stack.WaitTimeout)

-		log.Debugf("set waiting timeout to %d second(s)", stack.WaitTimeout)
-
-		serviceNames, err := appPkg.GetAppServiceNames(app.Name)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		f, err := app.Filters(true, false, serviceNames...)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		if err := stack.RunDeploy(
-			cl,
-			deployOpts,
-			compose,
-			stackName,
-			app.Server,
-			internal.DontWaitConverge,
-			f,
-		); err != nil {
+		if err := stack.RunDeploy(cl, deployOpts, compose, stackName, 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)
 			}
 		}

-		if err := app.WriteRecipeVersion(chosenUpgrade, false); err != nil {
-			log.Fatalf("writing recipe version failed: %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)
 		}
 	},
 }

-// 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 fmt.Errorf("parsing chosen upgrade version failed: %s", err)
-	}
-
-	parsedDeployedVersion, err := tagcmp.Parse(deployMeta.Version)
-	if err != nil {
-		return fmt.Errorf("parsing deployment version failed: %s", err)
-	}
-
-	for _, version := range internal.SortVersionsDesc(versions) {
-		parsedVersion, err := tagcmp.Parse(version)
-		if err != nil {
-			return fmt.Errorf("parsing recipe version failed: %s", err)
-		}
-
-		if parsedVersion.IsGreaterThan(parsedDeployedVersion) &&
-			parsedVersion.IsLessThan(parsedChosenUpgrade) {
-			note, err := app.Recipe.GetReleaseNotes(version)
-			if err != nil {
-				return err
-			}
-
-			if note != "" {
-				// NOTE(d1): trim any final newline on the end of the note itself before
-				//           we manually handle newlines (for multiple release notes and
-				//           ensuring space between the warning messages)
-				note = strings.TrimSuffix(note, "\n")
-
-				*upgradeReleaseNotes += fmt.Sprintf("%s\n", note)
-			}
-		}
-	}
-
-	return nil
-}
-
-// ensureUpgradesAvailable ensures that there are available upgrades.
-func ensureUpgradesAvailable(
-	app app.App,
-	versions []string,
-	availableUpgrades *[]string,
-	deployMeta stack.DeployMeta,
-) (bool, error) {
-	parsedDeployedVersion, err := tagcmp.Parse(deployMeta.Version)
-	if err != nil {
-		return false, fmt.Errorf("parsing deployed version failed: %s", err)
-	}
-
-	for _, version := range versions {
-		parsedVersion, err := tagcmp.Parse(version)
-		if err != nil {
-			return false, fmt.Errorf("parsing recipe version failed: %s", 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 fmt.Errorf("'%s' is not a known version", deployMeta.Version)
-	}
-
-	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
+var (
+	showReleaseNotes bool
+)

 func init() {
 	AppUpgradeCommand.Flags().BoolVarP(
@ -448,7 +321,7 @@ func init() {
 		&internal.DontWaitConverge, "no-converge-checks",
 		"c",
 		false,
-		"disable converge logic checks",
+		"do not wait for converge logic checks",
 	)

 	AppUpgradeCommand.Flags().BoolVarP(
--- a/cli/app/volume.go
+++ b/cli/app/volume.go
@ -2,7 +2,6 @@ package app

 import (
 	"context"
-	"fmt"

 	"coopcloud.tech/abra/cli/internal"
 	"coopcloud.tech/abra/pkg/autocomplete"
@ -15,7 +14,7 @@ import (
 )

 var AppVolumeListCommand = &cobra.Command{
-	Use:     "list <domain> [flags]",
+	Use:     "list <app> [flags]",
 	Aliases: []string{"ls"},
 	Short:   "List volumes associated with an app",
 	Args:    cobra.ExactArgs(1),
@ -72,23 +71,18 @@ var AppVolumeListCommand = &cobra.Command{
 }

 var AppVolumeRemoveCommand = &cobra.Command{
-	Use:   "remove <domain> [volume] [flags]",
+	Use:   "remove <app> [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 <domain>" for more.
+"abra app undeploy <app>" 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
 interface.

 Passing "--force/-f" will select all volumes for removal. Be careful.`,
-	Example: `  # delete volumes interactively
-  abra app volume rm 1312.net
-
-  # delete specific volume
-  abra app volume rm 1312.net my_volume`,
 	Aliases: []string{"rm"},
 	Args:    cobra.MinimumNArgs(1),
 	ValidArgsFunction: func(
@ -100,11 +94,6 @@ Passing "--force/-f" will select all volumes for removal. Be careful.`,
 	Run: func(cmd *cobra.Command, args []string) {
 		app := internal.ValidateApp(args)

-		var volumeToDelete string
-		if len(args) == 2 {
-			volumeToDelete = args[1]
-		}
-
 		cl, err := client.New(app.Server)
 		if err != nil {
 			log.Fatal(err)
@ -130,30 +119,6 @@ Passing "--force/-f" will select all volumes for removal. Be careful.`,
 		}
 		volumeNames := client.GetVolumeNames(volumeList)

-		if volumeToDelete != "" {
-			var exactMatch bool
-
-			fullVolumeToDeleteName := fmt.Sprintf("%s_%s", app.StackName(), volumeToDelete)
-			for _, volName := range volumeNames {
-				if volName == fullVolumeToDeleteName {
-					exactMatch = true
-				}
-			}
-
-			if !exactMatch {
-				log.Fatalf("unable to remove volume: no volume with name '%s'?", volumeToDelete)
-			}
-
-			err := client.RemoveVolumes(cl, context.Background(), []string{fullVolumeToDeleteName}, internal.Force, 5)
-			if err != nil {
-				log.Fatalf("removing volume %s failed: %s", volumeToDelete, err)
-			}
-
-			log.Infof("volume %s removed successfully", volumeToDelete)
-
-			return
-		}
-
 		var volumesToRemove []string
 		if !internal.Force && !internal.NoInput {
 			volumesPrompt := &survey.MultiSelect{
--- a/cli/catalogue/catalogue.go
+++ b/cli/catalogue/catalogue.go
@ -5,7 +5,6 @@ import (
 	"fmt"
 	"io/ioutil"
 	"path"
-	"slices"

 	"coopcloud.tech/abra/cli/internal"
 	"coopcloud.tech/abra/pkg/autocomplete"
@ -16,31 +15,25 @@ import (
 	"coopcloud.tech/abra/pkg/log"
 	"coopcloud.tech/abra/pkg/recipe"
 	"github.com/go-git/go-git/v5"
-	"github.com/leonelquinteros/gotext"
 	"github.com/spf13/cobra"
 )

 var CatalogueGenerateCommand = &cobra.Command{
-	Use:     gotext.Get("generate [recipe] [flags]"),
+	Use:     "generate [recipe] [flags]",
 	Aliases: []string{"g"},
-	Short:   gotext.Get("Generate the recipe catalogue"),
-	Long: gotext.Get(`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.
+	Short:   "Generate the recipe catalogue",
+	Long: `Generate a new copy of the recipe catalogue.

 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 "docker login" and Abra will automatically
-use those details.
+If you have a Hub account you can have Abra log you in to avoid this. Pass
+"--user" and "--pass".

 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
-keys configured on your account.`),
+keys configured on your account.`,
 	Args: cobra.RangeArgs(0, 1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@ -54,62 +47,56 @@ 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(internal.Debug)
+		repos, err := recipe.ReadReposMetadata()
 		if err != nil {
 			log.Fatal(err)
 		}

-		barLength := len(repos)
+		var barLength int
+		var logMsg string
 		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 {
-			if err := recipe.UpdateRepositories(repos, recipeName, internal.Debug); err != nil {
+			log.Warn(logMsg)
+			if err := recipe.UpdateRepositories(repos, recipeName); err != nil {
 				log.Fatal(err)
 			}
 		}

-		var warnings []string
 		catl := make(recipe.RecipeCatalogue)
-		catlBar := formatter.CreateProgressbar(barLength, gotext.Get("collecting catalogue metadata"))
+		catlBar := formatter.CreateProgressbar(barLength, "generating catalogue metadata...")
 		for _, recipeMeta := range repos {
 			if recipeName != "" && recipeName != recipeMeta.Name {
-				if !internal.Debug {
-					catlBar.Add(1)
-				}
+				catlBar.Add(1)
 				continue
 			}

-			r := recipe.Get(recipeMeta.Name)
-			versions, warnMsgs, err := r.GetRecipeVersions()
+			versions, err := r.GetRecipeVersions()
 			if err != nil {
-				warnings = append(warnings, err.Error())
-			}
-			if len(warnMsgs) > 0 {
-				warnings = append(warnings, warnMsgs...)
+				log.Warn(err)
 			}

-			features, category, warnMsgs, err := recipe.GetRecipeFeaturesAndCategory(r)
+			features, category, err := recipe.GetRecipeFeaturesAndCategory(r)
 			if err != nil {
-				warnings = append(warnings, err.Error())
-			}
-			if len(warnMsgs) > 0 {
-				warnings = append(warnings, warnMsgs...)
+				log.Warn(err)
 			}

 			catl[recipeMeta.Name] = recipe.RecipeMeta{
@ -125,24 +112,7 @@ 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)
+			catlBar.Add(1)
 		}

 		recipesJSON, err := json.MarshalIndent(catl, "", "    ")
@ -172,7 +142,7 @@ keys configured on your account.`),
 			}
 		}

-		log.Info(gotext.Get("generated recipe catalogue: %s", config.RECIPES_JSON))
+		log.Infof("generated new recipe catalogue in %s", config.RECIPES_JSON)

 		cataloguePath := path.Join(config.ABRA_DIR, "catalogue")
 		if publishChanges {
@ -184,11 +154,11 @@ keys configured on your account.`),

 			if isClean {
 				if !internal.Dry {
-					log.Fatal(gotext.Get("no changes discovered in %s, nothing to publish?", cataloguePath))
+					log.Fatalf("no changes discovered in %s, nothing to publish?", cataloguePath)
 				}
 			}

-			msg := gotext.Get("chore: publish new catalogue release changes")
+			msg := "chore: publish new catalogue release changes"
 			if err := gitPkg.Commit(cataloguePath, msg, internal.Dry); err != nil {
 				log.Fatal(err)
 			}
@ -198,7 +168,7 @@ keys configured on your account.`),
 				log.Fatal(err)
 			}

-			sshURL := fmt.Sprintf(config.TOOLSHED_SSH_URL_TEMPLATE, config.CATALOGUE_JSON_REPO_NAME)
+			sshURL := fmt.Sprintf(config.SSH_URL_TEMPLATE, config.CATALOGUE_JSON_REPO_NAME)
 			if err := gitPkg.CreateRemote(repo, "origin-ssh", sshURL, internal.Dry); err != nil {
 				log.Fatal(err)
 			}
@ -220,19 +190,19 @@ keys configured on your account.`),

 		if !internal.Dry && publishChanges {
 			url := fmt.Sprintf("%s/%s/commit/%s", config.REPOS_BASE_URL, config.CATALOGUE_JSON_REPO_NAME, head.Hash())
-			log.Info(gotext.Get("new changes published: %s", url))
+			log.Infof("new changes published: %s", url)
 		}

 		if internal.Dry {
-			log.Info(gotext.Get("dry run: no changes published"))
+			log.Info("dry run: no changes published")
 		}
 	},
 }

 // CatalogueCommand defines the `abra catalogue` command and sub-commands.
 var CatalogueCommand = &cobra.Command{
-	Use:     gotext.Get("catalogue [cmd] [args] [flags]"),
-	Short:   gotext.Get("Manage the recipe catalogue"),
+	Use:     "catalogue [cmd] [args] [flags]",
+	Short:   "Manage the recipe catalogue",
 	Aliases: []string{"c"},
 }

@ -247,7 +217,7 @@ func init() {
 		"publish",
 		"p",
 		false,
-		gotext.Get("publish changes to git.coopcloud.tech"),
+		"publish changes to git.coopcloud.tech",
 	)

 	CatalogueGenerateCommand.Flags().BoolVarP(
@ -255,7 +225,7 @@ func init() {
 		"dry-run",
 		"r",
 		false,
-		gotext.Get("report changes that would be made"),
+		"report changes that would be made",
 	)

 	CatalogueGenerateCommand.Flags().BoolVarP(
@ -263,7 +233,7 @@ func init() {
 		"skip-updates",
 		"s",
 		false,
-		gotext.Get("skip updating recipe repositories"),
+		"skip updating recipe repositories",
 	)

 	CatalogueGenerateCommand.Flags().BoolVarP(
@ -271,6 +241,6 @@ func init() {
 		"chaos",
 		"C",
 		false,
-		gotext.Get("ignore uncommitted recipes changes"),
+		"ignore uncommitted recipes changes",
 	)
 }
--- a/cli/complete.go
+++ b/cli/complete.go
@ -3,26 +3,26 @@ package cli
 import (
 	"os"

-	"github.com/leonelquinteros/gotext"
 	"github.com/spf13/cobra"
 )

 var AutocompleteCommand = &cobra.Command{
-	Use:   gotext.Get("autocomplete [bash|zsh|fish|powershell]"),
-	Short: gotext.Get("Generate autocompletion script"),
-	Long: gotext.Get(`To load completions:
+	Use:   "autocomplete [bash|zsh|fish|powershell]",
+	Short: "Generate autocompletion script",
+	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 | sudo tee /etc/bash_completion.d/abra
+  $ abra autocomplete bash > /etc/bash_completion.d/abra
  # macOS:
-  $ abra autocomplete bash | sudo tee $(brew --prefix)/etc/bash_completion.d/abra
+  $ abra autocomplete bash > $(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,17 +34,19 @@ 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:
  PS> abra autocomplete powershell > abra.ps1
-  # and source this file from your PowerShell profile.`),
+  # and source this file from your PowerShell profile.`,
 	DisableFlagsInUseLine: true,
 	ValidArgs:             []string{"bash", "zsh", "fish", "powershell"},
 	Args:                  cobra.MatchAll(cobra.ExactArgs(1), cobra.OnlyValidArgs),
--- a/cli/internal/backup.go
+++ b/cli/internal/backup.go
@ -12,7 +12,6 @@ import (
 	"coopcloud.tech/abra/pkg/upstream/container"
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/docker/api/types"
-	containertypes "github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/filters"
 	dockerClient "github.com/docker/docker/client"
 )
@ -48,7 +47,7 @@ func RunBackupCmdRemote(
 	backupCmd string,
 	containerID string,
 	execEnv []string) (io.Writer, error) {
-	execBackupListOpts := containertypes.ExecOptions{
+	execBackupListOpts := types.ExecConfig{
 		AttachStderr: true,
 		AttachStdin:  true,
 		AttachStdout: true,
--- a/cli/internal/cli.go
+++ b/cli/internal/cli.go
@ -2,11 +2,9 @@ package internal

 var (
 	// NOTE(d1): global
-	Debug            bool
-	NoInput          bool
-	Offline          bool
-	IgnoreEnvVersion bool
-	Locale           string
+	Debug   bool
+	NoInput bool
+	Offline bool

 	// NOTE(d1): sub-command specific
 	Chaos            bool
--- a/cli/internal/command.go
+++ b/cli/internal/command.go
@ -14,7 +14,7 @@ import (
 	"coopcloud.tech/abra/pkg/log"
 	"coopcloud.tech/abra/pkg/upstream/container"
 	"github.com/docker/cli/cli/command"
-	containertypes "github.com/docker/docker/api/types/container"
+	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
 	dockerClient "github.com/docker/docker/client"
 	"github.com/docker/docker/pkg/archive"
@ -24,7 +24,7 @@ import (
 func RunCmdRemote(
 	cl *dockerClient.Client,
 	app appPkg.App,
-	disableTTY bool,
+	requestTTY bool,
 	abraSh, serviceName, cmdName, cmdArgs, remoteUser string) error {
 	filters := filters.NewArgs()
 	filters.Add("name", fmt.Sprintf("^%s_%s", app.StackName(), serviceName))
@ -42,7 +42,7 @@ func RunCmdRemote(
 		return err
 	}

-	copyOpts := containertypes.CopyToContainerOptions{AllowOverwriteDirWithFile: false, CopyUIDGID: false}
+	copyOpts := types.CopyToContainerOptions{AllowOverwriteDirWithFile: false, CopyUIDGID: false}
 	if err := cl.CopyToContainer(context.Background(), targetContainer.ID, "/tmp", content, copyOpts); err != nil {
 		return err
 	}
@ -55,7 +55,7 @@ func RunCmdRemote(

 	shell := "/bin/bash"
 	findShell := []string{"test", "-e", shell}
-	execCreateOpts := containertypes.ExecOptions{
+	execCreateOpts := types.ExecConfig{
 		AttachStderr: true,
 		AttachStdin:  true,
 		AttachStdout: true,
@ -84,10 +84,8 @@ func RunCmdRemote(
 	}

 	execCreateOpts.Cmd = cmd
-
-	execCreateOpts.Tty = true
-	if disableTTY {
-		execCreateOpts.Tty = false
+	execCreateOpts.Tty = requestTTY
+	if !requestTTY {
 		log.Debugf("not requesting a remote TTY")
 	}

--- a/cli/internal/deploy.go
+++ b/cli/internal/deploy.go
@ -37,21 +37,18 @@ func horizontal(left, mid, right string) string {
 	return lipgloss.JoinHorizontal(lipgloss.Left, left, mid, right)
 }

-func formatComposeFiles(composeFiles string) string {
-	return strings.ReplaceAll(composeFiles, ":", "\n")
-}
-
-// DeployOverview shows a deployment overview
-func DeployOverview(
+// NewVersionOverview shows an upgrade or downgrade overview
+func NewVersionOverview(
 	app appPkg.App,
-	deployedVersion string,
-	toDeployVersion string,
-	releaseNotes string,
 	warnMessages []string,
-) error {
+	kind,
+	deployedVersion,
+	deployedChaosVersion,
+	toDeployVersion,
+	releaseNotes string) error {
 	deployConfig := "compose.yml"
 	if composeFiles, ok := app.Env["COMPOSE_FILE"]; ok {
-		deployConfig = formatComposeFiles(composeFiles)
+		deployConfig = composeFiles
 	}

 	server := app.Server
@ -64,29 +61,30 @@ func DeployOverview(
 		domain = config.NO_DOMAIN_DEFAULT
 	}

-	envVersion := app.Recipe.EnvVersionRaw
-	if envVersion == "" {
-		envVersion = config.NO_VERSION_DEFAULT
-	}
-
 	rows := [][]string{
-		{"DOMAIN", domain},
-		{"RECIPE", app.Recipe.Name},
-		{"SERVER", server},
-		{"CONFIG", deployConfig},
-		{"", ""},
-		{"CURRENT DEPLOYMENT", formatter.BoldDirtyDefault(deployedVersion)},
-		{"ENV VERSION", formatter.BoldDirtyDefault(envVersion)},
-		{"NEW DEPLOYMENT", formatter.BoldDirtyDefault(toDeployVersion)},
+		[]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},
 	}

-	deployType := getDeployType(deployedVersion, toDeployVersion)
-	overview := formatter.CreateOverview(fmt.Sprintf("%s OVERVIEW", deployType), rows)
+	overview := formatter.CreateOverview(
+		fmt.Sprintf("%s OVERVIEW", strings.ToUpper(kind)),
+		rows,
+	)

 	fmt.Println(overview)

-	if releaseNotes != "" {
+	if releaseNotes != "" && toDeployVersion != "" {
 		fmt.Print(releaseNotes)
+	} else {
+		warnMessages = append(
+			warnMessages,
+			fmt.Sprintf("no release notes available for %s", toDeployVersion),
+		)
 	}

 	for _, msg := range warnMessages {
@ -110,34 +108,113 @@ func DeployOverview(
 	return nil
 }

-func getDeployType(currentVersion, newVersion string) string {
-	if newVersion == config.NO_DOMAIN_DEFAULT {
-		return "UNDEPLOY"
+// DeployOverview shows a deployment overview
+func DeployOverview(
+	app appPkg.App,
+	warnMessages []string,
+	deployedVersion string,
+	deployedChaosVersion string,
+	toDeployVersion,
+	toDeployChaosVersion string) error {
+	deployConfig := "compose.yml"
+	if composeFiles, ok := app.Env["COMPOSE_FILE"]; ok {
+		deployConfig = composeFiles
 	}
-	if strings.Contains(newVersion, "+U") {
-		return "CHAOS DEPLOY"
+
+	server := app.Server
+	if app.Server == "default" {
+		server = "local"
 	}
-	if strings.Contains(currentVersion, "+U") {
-		return "UNCHAOS DEPLOY"
+
+	domain := app.Domain
+	if domain == "" {
+		domain = config.NO_DOMAIN_DEFAULT
 	}
-	if currentVersion == newVersion {
-		return "REDEPLOY"
+
+	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},
 	}
-	if currentVersion == config.NO_VERSION_DEFAULT {
-		return "NEW DEPLOY"
+
+	overview := formatter.CreateOverview("DEPLOY OVERVIEW", rows)
+
+	fmt.Println(overview)
+
+	for _, msg := range warnMessages {
+		log.Warn(msg)
 	}
-	currentParsed, err := tagcmp.Parse(currentVersion)
-	if err != nil {
-		return "DEPLOY"
+
+	if NoInput {
+		return nil
 	}
-	newParsed, err := tagcmp.Parse(newVersion)
-	if err != nil {
-		return "DEPLOY"
+
+	response := false
+	prompt := &survey.Confirm{Message: "proceed?"}
+	if err := survey.AskOne(prompt, &response); err != nil {
+		return err
 	}
-	if currentParsed.IsLessThan(newParsed) {
-		return "UPGRADE"
+
+	if !response {
+		log.Fatal("deployment cancelled")
 	}
-	return "DOWNGRADE"
+
+	return nil
+}
+
+// UndeployOverview shows an undeployment overview
+func UndeployOverview(
+	app appPkg.App,
+	version,
+	chaosVersion string) error {
+	deployConfig := "compose.yml"
+	if composeFiles, ok := app.Env["COMPOSE_FILE"]; ok {
+		deployConfig = composeFiles
+	}
+
+	server := app.Server
+	if app.Server == "default" {
+		server = "local"
+	}
+
+	domain := app.Domain
+	if domain == "" {
+		domain = config.NO_DOMAIN_DEFAULT
+	}
+
+	rows := [][]string{
+		[]string{"APP", domain},
+		[]string{"RECIPE", app.Recipe.Name},
+		[]string{"SERVER", server},
+		[]string{"DEPLOYED", version},
+		[]string{"CHAOS", chaosVersion},
+		[]string{"CONFIG", deployConfig},
+	}
+
+	overview := formatter.CreateOverview("UNDEPLOY OVERVIEW", rows)
+
+	fmt.Println(overview)
+
+	if NoInput {
+		return nil
+	}
+
+	response := false
+	prompt := &survey.Confirm{Message: "proceed?"}
+	if err := survey.AskOne(prompt, &response); err != nil {
+		return err
+	}
+
+	if !response {
+		log.Fatal("undeploy cancelled")
+	}
+
+	return nil
 }

 // PostCmds parses a string of commands and executes them inside of the respective services
@ -146,7 +223,7 @@ func getDeployType(currentVersion, newVersion string) string {
 func PostCmds(cl *dockerClient.Client, app appPkg.App, commands string) error {
 	if _, err := os.Stat(app.Recipe.AbraShPath); err != nil {
 		if os.IsNotExist(err) {
-			return fmt.Errorf("%s does not exist for %s?", app.Recipe.AbraShPath, app.Name)
+			return fmt.Errorf(fmt.Sprintf("%s does not exist for %s?", app.Recipe.AbraShPath, app.Name))
 		}
 		return err
 	}
@ -154,7 +231,7 @@ func PostCmds(cl *dockerClient.Client, app appPkg.App, commands string) error {
 	for _, command := range strings.Split(commands, "|") {
 		commandParts := strings.Split(command, " ")
 		if len(commandParts) < 2 {
-			return fmt.Errorf("not enough arguments: %s", command)
+			return fmt.Errorf(fmt.Sprintf("not enough arguments: %s", command))
 		}
 		targetServiceName := commandParts[0]
 		cmdName := commandParts[1]
@ -181,7 +258,7 @@ func PostCmds(cl *dockerClient.Client, app appPkg.App, commands string) error {
 		}

 		if !matchingServiceName {
-			return fmt.Errorf("no service %s for %s?", targetServiceName, app.Name)
+			return fmt.Errorf(fmt.Sprintf("no service %s for %s?", targetServiceName, app.Name))
 		}

 		log.Debugf("running command %s %s within the context of %s_%s", cmdName, parsedCmdArgs, app.StackName(), targetServiceName)
--- a/cli/internal/deploy_test.go
+++ b/cli/internal/deploy_test.go
@ -1,17 +0,0 @@
-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])
-}
--- a/cli/internal/ensure.go
+++ b/cli/internal/ensure.go
@ -1,11 +0,0 @@
-package internal
-
-import "coopcloud.tech/abra/pkg/recipe"
-
-func GetEnsureContext() recipe.EnsureContext {
-	return recipe.EnsureContext{
-		Chaos,
-		Offline,
-		IgnoreEnvVersion,
-	}
-}
--- a/cli/internal/errors.go
+++ b/cli/internal/errors.go
@ -0,0 +1,18 @@
+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)
+}
--- a/cli/internal/validate.go
+++ b/cli/internal/validate.go
@ -17,34 +17,34 @@ func ValidateRecipe(args []string, cmdName string) recipe.Recipe {
 		recipeName = args[0]
 	}

-	var recipes []string
+	if recipeName == "" && !NoInput {
+		var recipes []string

-	catl, err := recipe.ReadRecipeCatalogue(Offline)
-	if err != nil {
-		log.Fatal(err)
-	}
+		catl, err := recipe.ReadRecipeCatalogue(Offline)
+		if err != nil {
+			log.Fatal(err)
+		}

-	knownRecipes := make(map[string]bool)
-	for name := range catl {
-		knownRecipes[name] = true
-	}
+		knownRecipes := make(map[string]bool)
+		for name := range catl {
+			knownRecipes[name] = true
+		}
+
+		localRecipes, err := recipe.GetRecipesLocal()
+		if err != nil {
+			log.Fatal(err)
+		}

-	localRecipes, err := recipe.GetRecipesLocal()
-	if err != nil {
-		log.Debugf("can't read local recipes: %s", err)
-	} else {
 		for _, recipeLocal := range localRecipes {
 			if _, ok := knownRecipes[recipeLocal]; !ok {
 				knownRecipes[recipeLocal] = true
 			}
 		}
-	}

-	for recipeName := range knownRecipes {
-		recipes = append(recipes, recipeName)
-	}
+		for recipeName := range knownRecipes {
+			recipes = append(recipes, recipeName)
+		}

-	if recipeName == "" && !NoInput {
 		prompt := &survey.Select{
 			Message: "Select recipe",
 			Options: recipes,
@ -58,17 +58,11 @@ func ValidateRecipe(args []string, cmdName string) recipe.Recipe {
 		log.Fatal("no recipe name provided")
 	}

-	if _, ok := knownRecipes[recipeName]; !ok {
-		if !strings.Contains(recipeName, "/") {
-			log.Fatalf("no recipe '%s' exists?", recipeName)
-		}
-	}
-
 	chosenRecipe := recipe.Get(recipeName)
-	if err := chosenRecipe.EnsureExists(); err != nil {
+	err := chosenRecipe.EnsureExists()
+	if err != nil {
 		log.Fatal(err)
 	}
-
 	_, err = chosenRecipe.GetComposeConfig(nil)
 	if err != nil {
 		if cmdName == "generate" {
--- a/cli/recipe/diff.go
+++ b/cli/recipe/diff.go
@ -1,6 +1,8 @@
 package recipe

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

 import (
-	"os"
-
 	"coopcloud.tech/abra/cli/internal"
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/formatter"
 	"coopcloud.tech/abra/pkg/log"
 	"coopcloud.tech/abra/pkg/recipe"
-	"github.com/go-git/go-git/v5"
-	gitCfg "github.com/go-git/go-git/v5/config"
 	"github.com/spf13/cobra"
 )

@ -17,16 +13,7 @@ var RecipeFetchCommand = &cobra.Command{
 	Use:     "fetch [recipe | --all] [flags]",
 	Aliases: []string{"f"},
 	Short:   "Clone recipe(s) locally",
-	Long:    `Using "--force/-f" Git syncs an existing recipe. It does not erase unstaged changes.`,
 	Args:    cobra.RangeArgs(0, 1),
-	Example: `  # fetch from recipe catalogue
-  abra recipe fetch gitea
-
-  # fetch from remote recipe
-  abra recipe fetch git.foo.org/recipes/myrecipe
-
-  # fetch with ssh remote for hacking
-  abra recipe fetch gitea --ssh`,
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
 		args []string,
@ -48,39 +35,10 @@ var RecipeFetchCommand = &cobra.Command{
 		}

 		if recipeName != "" {
-			r := recipe.Get(recipeName)
-			if _, err := os.Stat(r.Dir); !os.IsNotExist(err) {
-				if !force {
-					log.Warnf("%s is already fetched", r.Name)
-					return
-				}
+			r := internal.ValidateRecipe(args, cmd.Name())
+			if err := r.Ensure(false, false); err != nil {
+				log.Fatal(err)
 			}
-
-			r = internal.ValidateRecipe(args, cmd.Name())
-
-			if sshRemote {
-				if r.SSHURL == "" {
-					log.Warnf("unable to discover SSH remote for %s", r.Name)
-					return
-				}
-
-				repo, err := git.PlainOpen(r.Dir)
-				if err != nil {
-					log.Fatalf("unable to open %s: %s", r.Dir, err)
-				}
-
-				if err = repo.DeleteRemote("origin"); err != nil {
-					log.Fatalf("unable to remove default remote in %s: %s", r.Dir, err)
-				}
-
-				if _, err := repo.CreateRemote(&gitCfg.RemoteConfig{
-					Name: "origin",
-					URLs: []string{r.SSHURL},
-				}); err != nil {
-					log.Fatalf("unable to set SSH remote in %s: %s", r.Dir, err)
-				}
-			}
-
 			return
 		}

@ -90,10 +48,9 @@ var RecipeFetchCommand = &cobra.Command{
 		}

 		catlBar := formatter.CreateProgressbar(len(catalogue), "fetching latest recipes...")
-		ensureCtx := internal.GetEnsureContext()
 		for recipeName := range catalogue {
 			r := recipe.Get(recipeName)
-			if err := r.Ensure(ensureCtx); err != nil {
+			if err := r.Ensure(false, false); err != nil {
 				log.Error(err)
 			}
 			catlBar.Add(1)
@ -103,8 +60,6 @@ var RecipeFetchCommand = &cobra.Command{

 var (
 	fetchAllRecipes bool
-	sshRemote       bool
-	force           bool
 )

 func init() {
@ -115,20 +70,4 @@ func init() {
 		false,
 		"fetch all recipes",
 	)
-
-	RecipeFetchCommand.Flags().BoolVarP(
-		&sshRemote,
-		"ssh",
-		"s",
-		false,
-		"automatically set ssh remote",
-	)
-
-	RecipeFetchCommand.Flags().BoolVarP(
-		&force,
-		"force",
-		"f",
-		false,
-		"force re-fetch",
-	)
 }
--- a/cli/recipe/lint.go
+++ b/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.GetEnsureContext()); err != nil {
+		if err := recipe.Ensure(internal.Chaos, internal.Offline); err != nil {
 			log.Fatal(err)
 		}

--- a/cli/recipe/new.go
+++ b/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 .git repo in %s", gitRepo)
+		log.Debugf("removed example git repo in %s", gitRepo)

 		meta := newRecipeMeta(recipeName)

@ -76,6 +76,7 @@ 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 {
--- a/cli/recipe/release.go
+++ b/cli/recipe/release.go
@ -118,9 +118,13 @@ your SSH keys configured on your account.`,

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

 		if len(tags) > 0 {
@ -267,8 +271,6 @@ 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>
@ -278,37 +280,38 @@ func addReleaseNotes(recipe recipe.Recipe, tag string) error {
 		}

 		if !internal.NoInput {
-			prompt := &survey.Confirm{
+			prompt := &survey.Input{
 				Message: "Use release note in release/next?",
 			}
-
-			if err := survey.AskOne(prompt, &addNextAsReleaseNotes); err != nil {
+			var addReleaseNote bool
+			if err := survey.AskOne(prompt, &addReleaseNote); err != nil {
 				return err
 			}
-
-			if !addNextAsReleaseNotes {
+			if !addReleaseNote {
 				return nil
 			}
 		}

-		if err := os.Rename(nextReleaseNotePath, tagReleaseNotePath); err != nil {
+		err := os.Rename(nextReleaseNotePath, tagReleaseNotePath)
+		if err != nil {
 			return err
 		}

-		if err := gitPkg.Add(recipe.Dir, path.Join("release", "next"), internal.Dry); err != nil {
+		err = gitPkg.Add(recipe.Dir, path.Join("release", "next"), internal.Dry)
+		if err != nil {
 			return err
 		}

-		if err := gitPkg.Add(recipe.Dir, path.Join("release", tag), internal.Dry); err != nil {
+		err = gitPkg.Add(recipe.Dir, path.Join("release", tag), internal.Dry)
+		if err != nil {
 			return err
 		}
 	} else if !errors.Is(err, os.ErrNotExist) {
 		return err
 	}

-	// 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 {
+	// No release note exists for the current release.
+	if internal.NoInput {
 		return nil
 	}

--- a/cli/recipe/sync.go
+++ b/cli/recipe/sync.go
@ -208,9 +208,13 @@ likely to change.
 		}
 		if !isClean {
 			log.Infof("%s currently has these unstaged changes 👇", recipe.Name)
-			if err := gitPkg.DiffUnstaged(recipe.Dir); err != nil {
+			diff, err := gitPkg.DiffUnstaged(recipe.Dir, "")
+			if err != nil {
 				log.Fatal(err)
 			}
+			if diff != "" {
+				fmt.Print(diff)
+			}
 		}
 	},
 }
--- a/cli/recipe/upgrade.go
+++ b/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.GetEnsureContext()); err != nil {
+		if err := recipe.Ensure(internal.Chaos, internal.Offline); err != nil {
 			log.Fatal(err)
 		}

@ -327,9 +327,13 @@ 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)
-			if err := gitPkg.DiffUnstaged(recipe.Dir); err != nil {
+			diff, err := gitPkg.DiffUnstaged(recipe.Dir, "")
+			if err != nil {
 				log.Fatal(err)
 			}
+			if diff != "" {
+				fmt.Print(diff)
+			}
 		}
 	},
 }
--- a/cli/recipe/version.go
+++ b/cli/recipe/version.go
@ -37,13 +37,10 @@ var RecipeVersionCommand = &cobra.Command{
 		if !ok {
 			warnMessages = append(warnMessages, "retrieved versions from local recipe repository")

-			recipeVersions, warnMsg, err := recipe.GetRecipeVersions()
+			recipeVersions, err := recipe.GetRecipeVersions()
 			if err != nil {
 				warnMessages = append(warnMessages, err.Error())
 			}
-			if len(warnMsg) > 0 {
-				warnMessages = append(warnMessages, warnMsg...)
-			}

 			recipeMeta = recipePkg.RecipeMeta{Versions: recipeVersions}
 		}
--- a/cli/run.go
+++ b/cli/run.go
@ -1,7 +1,6 @@
 package cli

 import (
-	"errors"
 	"fmt"
 	"os"

@ -11,113 +10,70 @@ import (
 	"coopcloud.tech/abra/cli/recipe"
 	"coopcloud.tech/abra/cli/server"
 	"coopcloud.tech/abra/pkg/config"
-	"coopcloud.tech/abra/pkg/formatter"
-	"coopcloud.tech/abra/pkg/lang"
 	"coopcloud.tech/abra/pkg/log"
 	charmLog "github.com/charmbracelet/log"
-	"github.com/leonelquinteros/gotext"
 	"github.com/spf13/cobra"
 	"github.com/spf13/cobra/doc"
 )

 func Run(version, commit string) {
 	rootCmd := &cobra.Command{
-		Use:     gotext.Get("abra [cmd] [args] [flags]"),
-		Short:   gotext.Get("The Co-op Cloud command-line utility belt 🎩🐇"),
+		Use:     "abra [cmd] [args] [flags]",
+		Short:   "The Co-op Cloud command-line utility belt 🎩🐇",
 		Version: fmt.Sprintf("%s-%s", version, commit[:7]),
 		ValidArgs: []string{
-			gotext.Get("app"),
-			gotext.Get("autocomplete"),
-			gotext.Get("catalogue"),
-			gotext.Get("man"),
-			gotext.Get("recipe"),
-			gotext.Get("server"),
-			gotext.Get("upgrade"),
+			"app",
+			"autocomplete",
+			"catalogue",
+			"man",
+			"recipe",
+			"server",
+			"upgrade",
 		},
-
-		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
-			dirs := []map[string]os.FileMode{
-				{config.ABRA_DIR: 0764},
-				{config.SERVERS_DIR: 0700},
-				{config.RECIPES_DIR: 0764},
-				{config.LOGS_DIR: 0764},
+		PersistentPreRun: func(cmd *cobra.Command, args []string) {
+			paths := []string{
+				config.ABRA_DIR,
+				config.SERVERS_DIR,
+				config.RECIPES_DIR,
+				config.VENDOR_DIR, // TODO(d1): remove > 0.9.x
+				config.BACKUP_DIR, // TODO(d1): remove > 0.9.x
 			}

-			for _, dir := range dirs {
-				for path, perm := range dir {
-					if err := os.Mkdir(path, perm); err != nil {
-						if !os.IsExist(err) {
-							return errors.New(gotext.Get("unable to create %s: %s", path, err))
-						}
-						continue
+			for _, path := range paths {
+				if err := os.Mkdir(path, 0764); err != nil {
+					if !os.IsExist(err) {
+						log.Fatal(err)
 					}
+					continue
 				}
 			}

-			log.Logger.SetStyles(charmLog.DefaultStyles())
+			log.Logger.SetStyles(log.Styles())
 			charmLog.SetDefault(log.Logger)

-			if internal.MachineReadable {
-				log.SetOutput(os.Stderr)
-			}
-
 			if internal.Debug {
 				log.SetLevel(log.DebugLevel)
 				log.SetOutput(os.Stderr)
 				log.SetReportCaller(true)
 			}

-			if internal.Locale != "" {
-				// FIXME(d1): get list of valid locales from pkg/locales/*
-				switch internal.Locale {
-				case "es":
-				default:
-					return errors.New(gotext.Get("unsupported --lang: %s (want: es)", internal.Locale))
-				}
-			}
-
-			systemLocale := lang.GetLocale()
-			if internal.Locale == "" && systemLocale != "" {
-				// FIXME(d1): validate system locale also (as above FIXME)
-				internal.Locale = systemLocale
-			}
-
-			if internal.Locale == "" {
-				// NOTE(d1): fallback when no --lang=<ll> / LANG=<ll_CC>
-				internal.Locale = "en"
-			}
-
-			// NOTE(d1): only required to load locale when not using en_<CC>
-			//           N.B we don't even bother with a _<CC> (country code) atm for en because fuck it
-			if internal.Locale != "en" {
-				if err := lang.LoadLocale(internal.Locale); err != nil {
-					return errors.New(gotext.Get("unable to load supported language %s: %s", internal.Locale, err))
-				}
-			}
-
-			log.Debug(gotext.Get(
-				"abra version: %s, commit: %s, lang: %s",
-				version, formatter.SmallSHA(commit), internal.Locale,
-			))
-
-			return nil
+			log.Debugf("abra version %s, commit %s", version, commit)
 		},
 	}

 	rootCmd.CompletionOptions.DisableDefaultCmd = true

 	manCommand := &cobra.Command{
-		Use:     gotext.Get("man [flags]"),
+		Use:     "man [flags]",
 		Aliases: []string{"m"},
-		Short:   gotext.Get("Generate manpage"),
-		Example: gotext.Get(`  # generate the man pages into /usr/local/share/man/man1
-  abra_path=$(which abra)  # pass abra absolute path to sudo below
-  sudo $abra_path man
+		Short:   "Generate manpage",
+		Example: `  # generate the man pages into /usr/local/share/man/man1
+  sudo abra man
  sudo mandb

  # read the man pages
  man abra
-  man abra-app-deploy`),
+  man abra-app-deploy`,
 		Run: func(cmd *cobra.Command, args []string) {
 			header := &doc.GenManHeader{
 				Title:   "ABRA",
@ -126,7 +82,7 @@ func Run(version, commit string) {

 			manDir := "/usr/local/share/man/man1"
 			if _, err := os.Stat(manDir); os.IsNotExist(err) {
-				log.Fatal(gotext.Get("unable to proceed, %s does not exist?", manDir))
+				log.Fatalf("unable to proceed, '%s' does not exist?")
 			}

 			err := doc.GenManTree(rootCmd, header, manDir)
@ -134,49 +90,23 @@ func Run(version, commit string) {
 				log.Fatal(err)
 			}

-			log.Info(gotext.Get("don't forget to run 'sudo mandb'"))
+			log.Info("don't forget to run 'sudo mandb'")
 		},
 	}

 	rootCmd.PersistentFlags().BoolVarP(
-		&internal.Debug,
-		"debug",
-		"d",
-		false,
-		gotext.Get("show debug messages"),
+		&internal.Debug, "debug", "d", false,
+		"show debug messages",
 	)

 	rootCmd.PersistentFlags().BoolVarP(
-		&internal.NoInput,
-		"no-input",
-		"n",
-		false,
-		gotext.Get("toggle non-interactive mode"),
+		&internal.NoInput, "no-input", "n", false,
+		"toggle non-interactive mode",
 	)

 	rootCmd.PersistentFlags().BoolVarP(
-		&internal.Offline,
-		"offline",
-		"o",
-		false,
-		gotext.Get("prefer offline & filesystem access"),
-	)
-
-	rootCmd.PersistentFlags().BoolVarP(
-		&internal.IgnoreEnvVersion,
-		"ignore-env-version",
-		"i",
-		false,
-		gotext.Get("ignore .env version checkout"),
-	)
-
-	rootCmd.PersistentFlags().StringVarP(
-		&internal.Locale,
-		"lang",
-		"l",
-		"",
-		// FIXME(d1): provide supported list of language via *.po file listing
-		gotext.Get("force select language (supported: XXX)"),
+		&internal.Offline, "offline", "o", false,
+		"prefer offline & filesystem access",
 	)

 	catalogue.CatalogueCommand.AddCommand(
@ -257,8 +187,8 @@ func Run(version, commit string) {
 		app.AppUndeployCommand,
 		app.AppUpgradeCommand,
 		app.AppVolumeCommand,
-		app.AppLabelsCommand,
-		app.AppEnvCommand,
+		app.AppDiffCommand,
+		app.AppPushCommand,
 	)

 	if err := rootCmd.Execute(); err != nil {
--- a/cli/server/add.go
+++ b/cli/server/add.go
@ -13,15 +13,14 @@ import (
 	"coopcloud.tech/abra/pkg/log"
 	"coopcloud.tech/abra/pkg/server"
 	sshPkg "coopcloud.tech/abra/pkg/ssh"
-	"github.com/leonelquinteros/gotext"
 	"github.com/spf13/cobra"
 )

 var ServerAddCommand = &cobra.Command{
-	Use:     gotext.Get("add [[server] | --local] [flags]"),
+	Use:     "add [[server] | --local] [flags]",
 	Aliases: []string{"a"},
-	Short:   gotext.Get("Add a new server"),
-	Long: gotext.Get(`Add a new server to your configuration so that it can be managed by Abra.
+	Short:   "Add a new server",
+	Long: `Add a new server to your configuration so that it can be managed by Abra.

 Abra relies on the standard SSH command-line and ~/.ssh/config for client
 connection details. You must configure an entry per-host in your ~/.ssh/config
@ -36,8 +35,8 @@ for each server:
 If "--local" is passed, then Abra assumes that the current local server is
 intended as the target server. This is useful when you want to have your entire
 Co-op Cloud config located on the server itself, and not on your local
-developer machine. The domain is then set to "default".`),
-	Example: gotext.Get("  abra server add 1312.net"),
+developer machine. The domain is then set to "default".`,
+	Example: "  abra server add 1312.net",
 	Args:    cobra.RangeArgs(0, 1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@ -50,11 +49,11 @@ developer machine. The domain is then set to "default".`),
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		if len(args) > 0 && local {
-			log.Fatal(gotext.Get("cannot use [server] and --local together"))
+			log.Fatal("cannot use [server] and --local together")
 		}

 		if len(args) == 0 && !local {
-			log.Fatal(gotext.Get("missing argument or --local/-l flag"))
+			log.Fatal("missing argument or --local/-l flag")
 		}

 		name := "default"
@ -73,7 +72,7 @@ developer machine. The domain is then set to "default".`),
 				log.Fatal(err)
 			}

-			log.Debug(gotext.Get("attempting to create client for %s", name))
+			log.Debugf("attempting to create client for %s", name)

 			if _, err := client.New(name, timeout); err != nil {
 				cleanUp(name)
@ -81,9 +80,9 @@ developer machine. The domain is then set to "default".`),
 			}

 			if created {
-				log.Info(gotext.Get("local server successfully added"))
+				log.Info("local server successfully added")
 			} else {
-				log.Warn(gotext.Get("local server already exists"))
+				log.Warn("local server already exists")
 			}

 			return
@ -97,27 +96,28 @@ developer machine. The domain is then set to "default".`),
 		created, err := newContext(name)
 		if err != nil {
 			cleanUp(name)
-			log.Fatal(gotext.Get("unable to create local context: %s", err))
+			log.Fatalf("unable to create local context: %s", err)
 		}

-		log.Debug(gotext.Get("attempting to create client for %s", name))
+		log.Debugf("attempting to create client for %s", name)

 		if _, err := client.New(name, timeout); err != nil {
 			cleanUp(name)
-			log.Fatal(gotext.Get("ssh %s error: %s", name, sshPkg.Fatal(name, err)))
+			log.Debugf("ssh %s error: %s", name, sshPkg.Fatal(name, err))
+			log.Fatalf("can't ssh to %s, make sure \"ssh %s\" works", name, name)
 		}

 		if created {
-			log.Info(gotext.Get("%s successfully added", name))
+			log.Infof("%s successfully added", name)

 			if _, err := dns.EnsureIPv4(name); err != nil {
-				log.Warn(gotext.Get("unable to resolve IPv4 for %s", name))
+				log.Warnf("unable to resolve IPv4 for %s", name)
 			}

 			return
 		}

-		log.Warn(gotext.Get("%s already exists", name))
+		log.Warnf("%s already exists", name)
 	},
 }

@ -125,7 +125,7 @@ developer machine. The domain is then set to "default".`),
 // "server add" attempt.
 func cleanUp(name string) {
 	if name != "default" {
-		log.Debug(gotext.Get("serverAdd: cleanUp: cleaning up context for %s", name))
+		log.Debugf("serverAdd: cleanUp: cleaning up context for %s", name)
 		if err := client.DeleteContext(name); err != nil {
 			log.Fatal(err)
 		}
@ -134,16 +134,16 @@ func cleanUp(name string) {
 	serverDir := filepath.Join(config.SERVERS_DIR, name)
 	files, err := config.GetAllFilesInDirectory(serverDir)
 	if err != nil {
-		log.Fatal(gotext.Get("serverAdd: cleanUp: unable to list files in %s: %s", serverDir, err))
+		log.Fatalf("serverAdd: cleanUp: unable to list files in %s: %s", serverDir, err)
 	}

 	if len(files) > 0 {
-		log.Debug(gotext.Get("serverAdd: cleanUp: %s is not empty, aborting cleanup", serverDir))
+		log.Debugf("serverAdd: cleanUp: %s is not empty, aborting cleanup", serverDir)
 		return
 	}

 	if err := os.RemoveAll(serverDir); err != nil {
-		log.Fatal(gotext.Get("serverAdd: cleanUp: failed to remove %s: %s", serverDir, err))
+		log.Fatalf("serverAdd: cleanUp: failed to remove %s: %s", serverDir, err)
 	}
 }

@ -160,12 +160,12 @@ func newContext(name string) (bool, error) {

 	for _, context := range contexts {
 		if context.Name == name {
-			log.Debug(gotext.Get("context for %s already exists", name))
+			log.Debugf("context for %s already exists", name)
 			return false, nil
 		}
 	}

-	log.Debugf(gotext.Get("creating context with domain %s", name))
+	log.Debugf("creating context with domain %s", name)

 	if err := client.CreateContext(name); err != nil {
 		return false, nil
@ -181,7 +181,7 @@ func createServerDir(name string) (bool, error) {
 			return false, err
 		}

-		log.Debug(gotext.Get("server dir for %s already created", name))
+		log.Debugf("server dir for %s already created", name)

 		return false, nil
 	}
@ -199,6 +199,6 @@ func init() {
 		"local",
 		"l",
 		false,
-		gotext.Get("use local server"),
+		"use local server",
 	)
 }
--- a/cli/server/list.go
+++ b/cli/server/list.go
@ -10,14 +10,13 @@ import (
 	"coopcloud.tech/abra/pkg/formatter"
 	"coopcloud.tech/abra/pkg/log"
 	"github.com/docker/cli/cli/connhelper/ssh"
-	"github.com/leonelquinteros/gotext"
 	"github.com/spf13/cobra"
 )

 var ServerListCommand = &cobra.Command{
-	Use:     gotext.Get("list [flags]"),
+	Use:     "list [flags]",
 	Aliases: []string{"ls"},
-	Short:   gotext.Get("List managed servers"),
+	Short:   "List managed servers",
 	Args:    cobra.NoArgs,
 	Run: func(cmd *cobra.Command, args []string) {
 		dockerContextStore := contextPkg.NewDefaultDockerContextStore()
@ -79,7 +78,7 @@ var ServerListCommand = &cobra.Command{
 		if internal.MachineReadable {
 			out, err := formatter.ToJSON(headers, rows)
 			if err != nil {
-				log.Fatal(gotext.Get("unable to render to JSON: %s", err))
+				log.Fatal("unable to render to JSON: %s", err)
 			}

 			fmt.Println(out)
@ -99,6 +98,6 @@ func init() {
 		"machine",
 		"m",
 		false,
-		gotext.Get("print machine-readable output"),
+		"print machine-readable output",
 	)
 }
--- a/cli/server/prune.go
+++ b/cli/server/prune.go
@ -7,18 +7,17 @@ import (
 	"coopcloud.tech/abra/pkg/formatter"
 	"coopcloud.tech/abra/pkg/log"
 	"github.com/docker/docker/api/types/filters"
-	"github.com/leonelquinteros/gotext"
 	"github.com/spf13/cobra"
 )

 var ServerPruneCommand = &cobra.Command{
-	Use:     gotext.Get("prune <server> [flags]"),
+	Use:     "prune <server> [flags]",
 	Aliases: []string{"p"},
-	Short:   gotext.Get("Prune resources on a server"),
-	Long: gotext.Get(`Prunes unused containers, networks, and dangling images.
+	Short:   "Prune resources on a server",
+	Long: `Prunes unused containers, networks, and dangling images.

 Use "--volumes/-v" to remove volumes that are not associated with a deployed
-app. This can result in unwanted data loss if not used carefully.`),
+app. This can result in unwanted data loss if not used carefully.`,
 	Args: cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@ -42,18 +41,18 @@ app. This can result in unwanted data loss if not used carefully.`),
 		}

 		cntSpaceReclaimed := formatter.ByteCountSI(cr.SpaceReclaimed)
-		log.Info(gotext.Get("containers pruned: %d; space reclaimed: %s", len(cr.ContainersDeleted), cntSpaceReclaimed))
+		log.Infof("containers pruned: %d; space reclaimed: %s", len(cr.ContainersDeleted), cntSpaceReclaimed)

 		nr, err := cl.NetworksPrune(cmd.Context(), filterArgs)
 		if err != nil {
 			log.Fatal(err)
 		}

-		log.Info(gotext.Get("networks pruned: %d", len(nr.NetworksDeleted)))
+		log.Infof("networks pruned: %d", len(nr.NetworksDeleted))

 		pruneFilters := filters.NewArgs()
 		if allFilter {
-			log.Debug(gotext.Get("removing all images, not only dangling ones"))
+			log.Debugf("removing all images, not only dangling ones")
 			pruneFilters.Add("dangling", "false")
 		}

@ -63,7 +62,7 @@ app. This can result in unwanted data loss if not used carefully.`),
 		}

 		imgSpaceReclaimed := formatter.ByteCountSI(ir.SpaceReclaimed)
-		log.Info(gotext.Get("images pruned: %d; space reclaimed: %s", len(ir.ImagesDeleted), imgSpaceReclaimed))
+		log.Infof("images pruned: %d; space reclaimed: %s", len(ir.ImagesDeleted), imgSpaceReclaimed)

 		if volumesFilter {
 			vr, err := cl.VolumesPrune(cmd.Context(), filterArgs)
@ -72,7 +71,7 @@ app. This can result in unwanted data loss if not used carefully.`),
 			}

 			volSpaceReclaimed := formatter.ByteCountSI(vr.SpaceReclaimed)
-			log.Info(gotext.Get("volumes pruned: %d; space reclaimed: %s", len(vr.VolumesDeleted), volSpaceReclaimed))
+			log.Infof("volumes pruned: %d; space reclaimed: %s", len(vr.VolumesDeleted), volSpaceReclaimed)
 		}

 		return
@ -90,7 +89,7 @@ func init() {
 		"all",
 		"a",
 		false,
-		gotext.Get("remove all unused images"),
+		"remove all unused images",
 	)

 	ServerPruneCommand.Flags().BoolVarP(
@ -98,6 +97,6 @@ func init() {
 		"volumes",
 		"v",
 		false,
-		gotext.Get("remove volumes"),
+		"remove volumes",
 	)
 }
--- a/cli/server/remove.go
+++ b/cli/server/remove.go
@ -9,19 +9,18 @@ import (
 	"coopcloud.tech/abra/pkg/client"
 	"coopcloud.tech/abra/pkg/config"
 	"coopcloud.tech/abra/pkg/log"
-	"github.com/leonelquinteros/gotext"
 	"github.com/spf13/cobra"
 )

 var ServerRemoveCommand = &cobra.Command{
-	Use:     gotext.Get("remove <server> [flags]"),
+	Use:     "remove <server> [flags]",
 	Aliases: []string{"rm"},
-	Short:   gotext.Get("Remove a managed server"),
-	Long: gotext.Get(`Remove a managed server.
+	Short:   "Remove a managed server",
+	Long: `Remove a managed server.

 Abra will remove the internal bookkeeping ($ABRA_DIR/servers/...) and
 underlying client connection context. This server will then be lost in time,
-like tears in rain.`),
+like tears in rain.`,
 	Args: cobra.ExactArgs(1),
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
@ -40,7 +39,7 @@ like tears in rain.`),
 			log.Fatal(err)
 		}

-		log.Info(gotext.Get("%s is now lost in time, like tears in rain", serverName))
+		log.Infof("%s is now lost in time, like tears in rain", serverName)

 		return
 	},
--- a/cli/server/server.go
+++ b/cli/server/server.go
@ -1,13 +1,10 @@
 package server

-import (
-	"github.com/leonelquinteros/gotext"
-	"github.com/spf13/cobra"
-)
+import "github.com/spf13/cobra"

 // ServerCommand defines the `abra server` command and its subcommands
 var ServerCommand = &cobra.Command{
-	Use:     gotext.Get("server [cmd] [args] [flags]"),
+	Use:     "server [cmd] [args] [flags]",
 	Aliases: []string{"s"},
-	Short:   gotext.Get("Manage servers"),
+	Short:   "Manage servers",
 }
--- a/cli/updater/updater.go
+++ b/cli/updater/updater.go
@ -2,7 +2,6 @@ package updater

 import (
 	"context"
-	"errors"
 	"fmt"
 	"os"
 	"strconv"
@ -22,7 +21,6 @@ import (
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
 	dockerclient "github.com/docker/docker/client"
-	"github.com/leonelquinteros/gotext"
 	"github.com/spf13/cobra"

 	"coopcloud.tech/abra/pkg/log"
@ -32,14 +30,14 @@ const SERVER = "localhost"

 // NotifyCommand checks for available upgrades.
 var NotifyCommand = &cobra.Command{
-	Use:     gotext.Get("notify [flags]"),
+	Use:     "notify [flags]",
 	Aliases: []string{"n"},
-	Short:   gotext.Get("Check for available upgrades"),
-	Long: gotext.Get(`Notify on new versions for deployed apps.
+	Short:   "Check for available upgrades",
+	Long: `Notify on new versions for deployed apps.

 If a new patch/minor version is available, a notification is printed.

-Use "--major/-m" to include new major versions.`),
+Use "--major/-m" to include new major versions.`,
 	Args: cobra.NoArgs,
 	Run: func(cmd *cobra.Command, args []string) {
 		cl, err := client.New("default")
@ -71,10 +69,10 @@ Use "--major/-m" to include new major versions.`),

 // UpgradeCommand upgrades apps.
 var UpgradeCommand = &cobra.Command{
-	Use:     gotext.Get("upgrade [[stack] [recipe] | --all] [flags]"),
+	Use:     "upgrade [[stack] [recipe] | --all] [flags]",
 	Aliases: []string{"u"},
-	Short:   gotext.Get("Upgrade apps"),
-	Long: gotext.Get(`Upgrade an app by specifying stack name and recipe. 
+	Short:   "Upgrade apps",
+	Long: `Upgrade an app by specifying stack name and recipe. 

 Use "--all" to upgrade every deployed app.

@ -85,7 +83,7 @@ available, the app is upgraded.
 To include major versions use the "--major/-m" flag. You probably don't want
 that as it will break things. Only apps that are not deployed with "--chaos/-C"
 are upgraded, to update chaos deployments use the "--chaos/-C" flag. Use it
-with care.`),
+with care.`,
 	Args: cobra.RangeArgs(0, 2),
 	// TODO(d1): complete stack/recipe
 	// ValidArgsFunction: func(
@ -100,7 +98,7 @@ with care.`),
 		}

 		if !updateAll && len(args) != 2 {
-			log.Fatal(gotext.Get("missing arguments or --all/-a flag"))
+			log.Fatal("missing arguments or --all/-a flag")
 		}

 		if !updateAll {
@ -152,7 +150,7 @@ func getLabel(cl *dockerclient.Client, stackName string, label string) (string,
 		}
 	}

-	log.Debug(gotext.Get("no %s label found for %s", label, stackName))
+	log.Debugf("no %s label found for %s", label, stackName)

 	return "", nil
 }
@ -173,7 +171,7 @@ func getBoolLabel(cl *dockerclient.Client, stackName string, label string) (bool
 		return value, nil
 	}

-	log.Debug(gotext.Get("boolean label %s could not be found for %s, set default to false.", label, stackName))
+	log.Debugf("boolean label %s could not be found for %s, set default to false.", label, stackName)

 	return false, nil
 }
@ -194,12 +192,12 @@ func getEnv(cl *dockerclient.Client, stackName string) (envfile.AppEnv, error) {
 		for _, envString := range envList {
 			splitString := strings.SplitN(envString, "=", 2)
 			if len(splitString) != 2 {
-				log.Debug(gotext.Get("can't separate key from value: %s (this variable is probably unset)", envString))
+				log.Debugf("can't separate key from value: %s (this variable is probably unset)", envString)
 				continue
 			}
 			k := splitString[0]
 			v := splitString[1]
-			log.Debugf(gotext.Get("for %s read env %s with value: %s from docker service", stackName, k, v))
+			log.Debugf("for %s read env %s with value: %s from docker service", stackName, k, v)
 			envMap[k] = v
 		}
 	}
@ -221,14 +219,14 @@ func getLatestUpgrade(cl *dockerclient.Client, stackName string, recipeName stri
 	}

 	if len(availableUpgrades) == 0 {
-		log.Debugf(gotext.Get("no available upgrades for %s", stackName))
+		log.Debugf("no available upgrades for %s", stackName)
 		return "", nil
 	}

 	var chosenUpgrade string
 	if len(availableUpgrades) > 0 {
 		chosenUpgrade = availableUpgrades[len(availableUpgrades)-1]
-		log.Info(gotext.Get("%s (%s) can be upgraded from version %s to %s", stackName, recipeName, deployedVersion, chosenUpgrade))
+		log.Infof("%s (%s) can be upgraded from version %s to %s", stackName, recipeName, deployedVersion, chosenUpgrade)
 	}

 	return chosenUpgrade, nil
@ -236,7 +234,7 @@ func getLatestUpgrade(cl *dockerclient.Client, stackName string, recipeName stri

 // getDeployedVersion returns the currently deployed version of an app.
 func getDeployedVersion(cl *dockerclient.Client, stackName string, recipeName string) (string, error) {
-	log.Debug(gotext.Get("retrieve deployed version whether %s is already deployed", stackName))
+	log.Debugf("retrieve deployed version whether %s is already deployed", stackName)

 	deployMeta, err := stack.IsDeployed(context.Background(), cl, stackName)
 	if err != nil {
@ -244,11 +242,11 @@ func getDeployedVersion(cl *dockerclient.Client, stackName string, recipeName st
 	}

 	if !deployMeta.IsDeployed {
-		return "", errors.New(gotext.Get("%s is not deployed?", stackName))
+		return "", fmt.Errorf("%s is not deployed?", stackName)
 	}

 	if deployMeta.Version == "unknown" {
-		return "", errors.New(gotext.Get("failed to determine deployed version of %s", stackName))
+		return "", fmt.Errorf("failed to determine deployed version of %s", stackName)
 	}

 	return deployMeta.Version, nil
@ -270,7 +268,7 @@ func getAvailableUpgrades(cl *dockerclient.Client, stackName string, recipeName
 	}

 	if len(versions) == 0 {
-		log.Warn(gotext.Get("no published releases for %s in the recipe catalogue?", recipeName))
+		log.Warnf("no published releases for %s in the recipe catalogue?", recipeName)
 		return nil, nil
 	}

@ -296,7 +294,7 @@ func getAvailableUpgrades(cl *dockerclient.Client, stackName string, recipeName
 		}
 	}

-	log.Debug(gotext.Get("available updates for %s: %s", stackName, availableUpgrades))
+	log.Debugf("available updates for %s: %s", stackName, availableUpgrades)

 	return availableUpgrades, nil
 }
@ -443,25 +441,7 @@ func upgrade(cl *dockerclient.Client, stackName, recipeName, upgradeVersion stri

 	log.Infof("upgrade %s (%s) to version %s", stackName, recipeName, upgradeVersion)

-	serviceNames, err := appPkg.GetAppServiceNames(app.Name)
-	if err != nil {
-		return err
-	}
-
-	f, err := app.Filters(true, false, serviceNames...)
-	if err != nil {
-		return err
-	}
-
-	err = stack.RunDeploy(
-		cl,
-		deployOpts,
-		compose,
-		stackName,
-		app.Server,
-		true,
-		f,
-	)
+	err = stack.RunDeploy(cl, deployOpts, compose, stackName, true)

 	return err
 }
@ -472,7 +452,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(charmLog.DefaultStyles())
+			log.Logger.SetStyles(log.Styles())
 			charmLog.SetDefault(log.Logger)

 			if internal.Debug {
--- a/cli/upgrade.go
+++ b/cli/upgrade.go
@ -7,23 +7,22 @@ import (

 	"coopcloud.tech/abra/cli/internal"
 	"coopcloud.tech/abra/pkg/log"
-	"github.com/leonelquinteros/gotext"
 	"github.com/spf13/cobra"
 )

 // UpgradeCommand upgrades abra in-place.
 var UpgradeCommand = &cobra.Command{
-	Use:     gotext.Get("upgrade [flags]"),
+	Use:     "upgrade [flags]",
 	Aliases: []string{"u"},
-	Short:   gotext.Get("Upgrade abra"),
-	Long: gotext.Get(`Upgrade abra in-place with the latest stable or release candidate.
+	Short:   "Upgrade abra",
+	Long: `Upgrade abra in-place with the latest stable or release candidate.

 By default, the latest stable release is downloaded.

 Use "--rc/-r" to install the latest release candidate. Please bear in mind that
 it may contain absolutely catastrophic deal-breaker bugs. Thank you very much
-for the testing efforts 💗`),
-	Example: gotext.Get("  abra upgrade --rc"),
+for the testing efforts 💗`,
+	Example: "  abra upgrade --rc",
 	Args:    cobra.NoArgs,
 	Run: func(cmd *cobra.Command, args []string) {
 		mainURL := "https://install.abra.coopcloud.tech"
@ -34,7 +33,7 @@ for the testing efforts 💗`),
 			c = exec.Command("bash", "-c", fmt.Sprintf("wget -q -O- %s | bash -s -- --rc", releaseCandidateURL))
 		}

-		log.Debugf(gotext.Get("attempting to run %s", c))
+		log.Debugf("attempting to run %s", c)

 		if err := internal.RunCmd(c); err != nil {
 			log.Fatal(err)
@ -52,6 +51,6 @@ func init() {
 		"rc",
 		"r",
 		false,
-		gotext.Get("install release candidate (may contain bugs)"),
+		"install release candidate (may contain bugs)",
 	)
 }
--- a/go.mod
+++ b/go.mod
@ -1,136 +1,129 @@
 module coopcloud.tech/abra

-go 1.24.0
+go 1.22.7

-toolchain go1.24.1
+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-20250818180036-0ec1b205b5ca
-	git.coopcloud.tech/toolshed/godotenv v1.5.2-0.20250103171850-4d0ca41daa5c
+	coopcloud.tech/tagcmp v0.0.0-20230809071031-eb3e7758d4eb
+	git.coopcloud.tech/coop-cloud/godotenv v1.5.2-0.20231130100509-01bff8284355
 	github.com/AlecAivazis/survey/v2 v2.3.7
-	github.com/charmbracelet/bubbletea v1.3.6
-	github.com/charmbracelet/lipgloss v1.1.0
-	github.com/charmbracelet/log v0.4.2
+	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 v28.3.3+incompatible
-	github.com/docker/docker v28.3.3+incompatible
+	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.16.2
-	github.com/google/go-cmp v0.7.0
-	github.com/leonelquinteros/gotext v1.7.2
+	github.com/go-git/go-git/v5 v5.12.0
+	github.com/google/go-cmp v0.6.0
 	github.com/moby/sys/signal v0.7.1
-	github.com/moby/term v0.5.2
+	github.com/moby/term v0.5.0
 	github.com/pkg/errors v0.9.1
-	github.com/schollz/progressbar/v3 v3.18.0
-	golang.org/x/term v0.34.0
+	github.com/schollz/progressbar/v3 v3.17.1
+	github.com/urfave/cli/v3 v3.0.0-alpha9
+	golang.org/x/term v0.27.0
 	gopkg.in/yaml.v3 v3.0.1
-	gotest.tools/v3 v3.5.2
+	gotest.tools/v3 v3.5.1
 )

 require (
-	dario.cat/mergo v1.0.2 // indirect
-	github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
-	github.com/BurntSushi/toml v1.5.0 // indirect
+	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/BurntSushi/toml v1.4.0 // indirect
 	github.com/Microsoft/go-winio v0.6.2 // indirect
-	github.com/ProtonMail/go-crypto v1.3.0 // indirect
+	github.com/ProtonMail/go-crypto v1.1.3 // indirect
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
-	github.com/cenkalti/backoff/v5 v5.0.3 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/charmbracelet/colorprofile v0.3.2 // indirect
-	github.com/charmbracelet/x/ansi v0.10.1 // indirect
-	github.com/charmbracelet/x/cellbuf v0.0.13 // indirect
-	github.com/charmbracelet/x/term v0.2.1 // indirect
-	github.com/cloudflare/circl v1.6.1 // indirect
-	github.com/containerd/errdefs v1.0.0 // indirect
-	github.com/containerd/errdefs/pkg v0.3.0 // indirect
+	github.com/charmbracelet/x/ansi v0.6.0 // indirect
+	github.com/cloudflare/circl v1.5.0 // indirect
 	github.com/containerd/log v0.1.0 // indirect
-	github.com/containerd/platforms v0.2.1 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
-	github.com/cyphar/filepath-securejoin v0.4.1 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
+	github.com/cyphar/filepath-securejoin v0.3.6 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/docker/distribution v2.8.3+incompatible // indirect
-	github.com/docker/go-connections v0.6.0 // indirect
+	github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c // indirect
+	github.com/docker/go-connections v0.5.0 // indirect
 	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.2 // indirect
+	github.com/go-git/go-billy/v5 v5.6.0 // indirect
 	github.com/go-logfmt/logfmt v0.6.0 // indirect
-	github.com/go-logr/logr v1.4.3 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
+	github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
 	github.com/kevinburke/ssh_config v1.2.0 // indirect
-	github.com/klauspost/compress v1.18.0 // indirect
+	github.com/klauspost/compress v1.17.11 // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
-	github.com/mattn/go-colorable v0.1.14 // 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/moby/docker-image-spec v1.3.1 // indirect
-	github.com/moby/go-archive v0.1.0 // indirect
-	github.com/moby/sys/atomicwriter v0.1.0 // indirect
-	github.com/moby/sys/user v0.4.0 // 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.16.0 // 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/pjbgf/sha1cd v0.4.0 // indirect
+	github.com/pelletier/go-toml v1.9.5 // indirect
+	github.com/pjbgf/sha1cd v0.3.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/client_model v0.6.2 // indirect
-	github.com/prometheus/common v0.65.0 // indirect
-	github.com/prometheus/procfs v0.17.0 // indirect
+	github.com/prometheus/client_model v0.6.1 // indirect
+	github.com/prometheus/common v0.61.0 // indirect
+	github.com/prometheus/procfs v0.15.1 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
-	github.com/skeema/knownhosts v1.3.1 // indirect
-	github.com/spf13/pflag v1.0.7 // indirect
+	github.com/skeema/knownhosts v1.3.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
 	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
-	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 // indirect
-	go.opentelemetry.io/otel v1.37.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.37.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
+	go.opentelemetry.io/otel v1.33.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.33.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 // indirect
-	go.opentelemetry.io/otel/metric v1.37.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.37.0 // indirect
-	go.opentelemetry.io/otel/sdk/metric v1.37.0 // indirect
-	go.opentelemetry.io/otel/trace v1.37.0 // indirect
-	go.opentelemetry.io/proto/otlp v1.7.1 // indirect
-	golang.org/x/crypto v0.41.0 // indirect
-	golang.org/x/exp v0.0.0-20250813145105-42675adae3e6 // indirect
-	golang.org/x/net v0.43.0 // indirect
-	golang.org/x/sync v0.16.0 // indirect
-	golang.org/x/text v0.28.0 // indirect
-	golang.org/x/time v0.12.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20250811230008-5f3141c8851a // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20250811230008-5f3141c8851a // indirect
-	google.golang.org/grpc v1.74.2 // indirect
-	google.golang.org/protobuf v1.36.7 // indirect
+	go.opentelemetry.io/otel/metric v1.33.0 // indirect
+	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
+	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
+	google.golang.org/grpc v1.69.2 // indirect
+	google.golang.org/protobuf v1.36.1 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
@ -139,19 +132,19 @@ require (
 	github.com/containers/image v3.0.2+incompatible
 	github.com/containers/storage v1.38.2 // indirect
 	github.com/decentral1se/passgen v1.0.1
-	github.com/docker/docker-credential-helpers v0.9.3 // indirect
+	github.com/docker/docker-credential-helpers v0.8.2 // indirect
 	github.com/fvbommel/sortorder v1.1.0 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
 	github.com/gorilla/mux v1.8.1 // indirect
-	github.com/hashicorp/go-retryablehttp v0.7.8
+	github.com/hashicorp/go-retryablehttp v0.7.7
 	github.com/moby/patternmatcher v0.6.0 // indirect
 	github.com/moby/sys/sequential v0.6.0 // indirect
-	github.com/opencontainers/image-spec v1.1.1 // indirect
-	github.com/prometheus/client_golang v1.23.0 // indirect
-	github.com/sergi/go-diff v1.4.0 // indirect
-	github.com/spf13/cobra v1.9.1
+	github.com/opencontainers/image-spec v1.1.0 // indirect
+	github.com/prometheus/client_golang v1.20.5 // indirect
+	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
+	github.com/spf13/cobra v1.8.1
 	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.35.0
+	golang.org/x/sys v0.28.0
 )
--- a/go.sum
+++ b/go.sum
@ -22,21 +22,21 @@ cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIA
 cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
 cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
 cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
-coopcloud.tech/tagcmp v0.0.0-20250818180036-0ec1b205b5ca h1:gSD53tBAsbIGq4SnFfq+mEep6foekQ2a5ea7b38qkm0=
-coopcloud.tech/tagcmp v0.0.0-20250818180036-0ec1b205b5ca/go.mod h1:ESVm0wQKcbcFi06jItF3rI7enf4Jt2PvbkWpDDHk1DQ=
-dario.cat/mergo v1.0.2 h1:85+piFYR1tMbRrLcDwR18y4UKJ3aH1Tbzi24VRW1TK8=
-dario.cat/mergo v1.0.2/go.mod h1:E/hbnu0NxMFBjpMIE34DRGLWqDy0g5FuKDhCb31ngxA=
+coopcloud.tech/tagcmp v0.0.0-20230809071031-eb3e7758d4eb h1:Ws6WEwKXeaYEkfdkX6AqX1XLPuaCeyStEtxbmEJPllk=
+coopcloud.tech/tagcmp v0.0.0-20230809071031-eb3e7758d4eb/go.mod h1:ESVm0wQKcbcFi06jItF3rI7enf4Jt2PvbkWpDDHk1DQ=
+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/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-20240806141605-e8a1dd7889d6 h1:He8afgbRMd7mFxO99hRNu+6tazq8nFF9lIwo9JFroBk=
-github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8=
+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=
+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-20250102033503-faa5f7b0171c h1:udKWzYgxTojEKWjV8V+WSxDXJ4NFATAsZjh8iIbsQIg=
-github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
+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-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=
@ -49,8 +49,8 @@ github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZ
 github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
-github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg=
-github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
+github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
+github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
 github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
@ -79,13 +79,14 @@ github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb0
 github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2 h1:+vx7roKuyA63nhn5WAunQHLTznkw5W8b1Xc0dNjp83s=
 github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2/go.mod h1:HBCaDeC1lPdgDeDbhX8XFpy1jqjK0IBG8W5K+xYqA0w=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/ProtonMail/go-crypto v1.3.0 h1:ILq8+Sf5If5DCpHQp4PbZdS1J7HDFRXz/+xKBiRGFrw=
-github.com/ProtonMail/go-crypto v1.3.0/go.mod h1:9whxjD8Rbs29b4XWbB8irEcE8KHMqaR2e7GWU1R+/PE=
+github.com/ProtonMail/go-crypto v1.1.3 h1:nRBOetoydLeUb4nHajyO2bKqMLfWQ/ZPwkXqXxPxCFk=
+github.com/ProtonMail/go-crypto v1.1.3/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
 github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/Shopify/logrus-bugsnag v0.0.0-20170309145241-6dbc35f2c30d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ=
+github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d h1:UrqY+r/OJnIp5u0s1SbQ8dVfLCZJsnvazdBP5hS4iRs=
 github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
@ -120,35 +121,31 @@ github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dR
 github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk=
 github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s=
 github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8=
+github.com/bugsnag/bugsnag-go v1.0.5-0.20150529004307-13fd6b8acda0 h1:s7+5BfS4WFJoVF9pnB8kBk03S7pZXRdKamnV0FOl5Sc=
 github.com/bugsnag/bugsnag-go v1.0.5-0.20150529004307-13fd6b8acda0/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8=
+github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b h1:otBG+dV+YK+Soembjv71DPz3uX/V/6MMlSyD9JBQ6kQ=
 github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0BsqsP2LwDJ9aOkm/6J86V6lyAXCoQWGw3K50=
+github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0 h1:nvj0OLI3YqYXer/kZD8Ri1aaunCxIEsOst1BVJswV0o=
 github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE=
 github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=
 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/cenkalti/backoff/v5 v5.0.3 h1:ZN+IMa753KfX5hd8vVaMixjnqRZ3y8CuJKRKj1xcsSM=
-github.com/cenkalti/backoff/v5 v5.0.3/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw=
 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.3.6 h1:VkHIxPJQeDt0aFJIsVxw8BQdh/F/L2KKZGsK6et5taU=
-github.com/charmbracelet/bubbletea v1.3.6/go.mod h1:oQD9VCRQFF8KplacJLo28/jofOI2ToOfGYeFgBBxHOc=
-github.com/charmbracelet/colorprofile v0.3.2 h1:9J27WdztfJQVAQKX2WOlSSRB+5gaKqqITmrvb1uTIiI=
-github.com/charmbracelet/colorprofile v0.3.2/go.mod h1:mTD5XzNeWHj8oqHb+S1bssQb7vIHbepiebQ2kPKVKbI=
-github.com/charmbracelet/lipgloss v1.1.0 h1:vYXsiLHVkK7fp74RkV7b2kq9+zDLoEU4MZoFqR/noCY=
-github.com/charmbracelet/lipgloss v1.1.0/go.mod h1:/6Q8FR2o+kj8rz4Dq0zQc3vYf7X+B0binUUBwA0aL30=
-github.com/charmbracelet/log v0.4.2 h1:hYt8Qj6a8yLnvR+h7MwsJv/XvmBJXiueUcI3cIxsyig=
-github.com/charmbracelet/log v0.4.2/go.mod h1:qifHGX/tc7eluv2R6pWIpyHDDrrb/AG71Pf2ysQu5nw=
-github.com/charmbracelet/x/ansi v0.10.1 h1:rL3Koar5XvX0pHGfovN03f5cxLbCF2YvLeyz7D2jVDQ=
-github.com/charmbracelet/x/ansi v0.10.1/go.mod h1:3RQDQ6lDnROptfpWuUVIUG64bD2g2BgntdxH0Ya5TeE=
-github.com/charmbracelet/x/cellbuf v0.0.13 h1:/KBBKHuVRbq1lYx5BzEHBAFBP8VcQzJejZ/IA3iR28k=
-github.com/charmbracelet/x/cellbuf v0.0.13/go.mod h1:xe0nKWGd3eJgtqZRaN9RjMtK7xUYchjzPr7q6kcvCCs=
+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/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=
@ -164,9 +161,10 @@ github.com/cilium/ebpf v0.4.0/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJ
 github.com/cilium/ebpf v0.6.2/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs=
 github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cloudflare/cfssl v0.0.0-20180223231731-4e2dcbde5004 h1:lkAMpLVBDaj17e85keuznYcH5rqI438v41pKcBl4ZxQ=
 github.com/cloudflare/cfssl v0.0.0-20180223231731-4e2dcbde5004/go.mod h1:yMWuSON2oQp+43nFtAV/uvKQIFpSPerB57DCt9t8sSA=
-github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0=
-github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
+github.com/cloudflare/circl v1.5.0 h1:hxIWksrX6XN5a1L2TI/h53AGPhNHoUBo+TD1ms9+pys=
+github.com/cloudflare/circl v1.5.0/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
@ -212,10 +210,6 @@ github.com/containerd/continuity v0.0.0-20200710164510-efbc4488d8fe/go.mod h1:cE
 github.com/containerd/continuity v0.0.0-20201208142359-180525291bb7/go.mod h1:kR3BEg7bDFaEddKm54WSmrol1fKWDU1nKYkgrcgZT7Y=
 github.com/containerd/continuity v0.0.0-20210208174643-50096c924a4e/go.mod h1:EXlVlkqNba9rJe3j7w3Xa924itAMLgZH4UD/Q4PExuQ=
 github.com/containerd/continuity v0.1.0/go.mod h1:ICJu0PwR54nI0yPEnJ6jcS+J7CZAUXrLh8lPo2knzsM=
-github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI=
-github.com/containerd/errdefs v1.0.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M=
-github.com/containerd/errdefs/pkg v0.3.0 h1:9IKJ06FvyNlexW690DXuQNx2KA2cUJXx151Xdx3ZPPE=
-github.com/containerd/errdefs/pkg v0.3.0/go.mod h1:NJw6s9HwNuRhnjJhM7pylWwMyAkmCQvQ4GpJHEqRLVk=
 github.com/containerd/fifo v0.0.0-20180307165137-3d5202aec260/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI=
 github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI=
 github.com/containerd/fifo v0.0.0-20200410184934-f15a3290365b/go.mod h1:jPQ2IAeZRCYxpS/Cm1495vGFww6ecHmMk1YJH2Q5ln0=
@ -238,8 +232,6 @@ github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3
 github.com/containerd/nri v0.0.0-20201007170849-eb1350a75164/go.mod h1:+2wGSDGFYfE5+So4M5syatU0N0f0LbWpuqyMi4/BE8c=
 github.com/containerd/nri v0.0.0-20210316161719-dbaa18c31c14/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY=
 github.com/containerd/nri v0.1.0/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY=
-github.com/containerd/platforms v0.2.1 h1:zvwtM3rz2YHPQsF2CHYM8+KtB5dvhISiXh5ZpSBQv6A=
-github.com/containerd/platforms v0.2.1/go.mod h1:XHCb+2/hzowdiut9rkudds9bE5yJ7npe7dG/wG+uFPw=
 github.com/containerd/stargz-snapshotter/estargz v0.4.1/go.mod h1:x7Q9dg9QYb4+ELgxmo4gBUeJB0tl5dqH1Sdz0nJU1QM=
 github.com/containerd/stargz-snapshotter/estargz v0.11.0/go.mod h1:/KsZXsJRllMbTKFfG0miFQWViQKdI9+9aSXs+HN0+ac=
 github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o=
@ -286,9 +278,10 @@ 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=
-github.com/cpuguy83/go-md2man/v2 v2.0.7 h1:zbFlGlXEAKlwXpmvle3d8Oe3YnkKIK4xSRTd3sHPnBo=
-github.com/cpuguy83/go-md2man/v2 v2.0.7/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/creack/pty v1.1.17/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
@ -296,8 +289,10 @@ 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.4.1 h1:JyxxyPEaktOD+GAnqIqTf9A8tHyAG22rowi7HkoSU1s=
-github.com/cyphar/filepath-securejoin v0.4.1/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI=
+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=
 github.com/d2g/dhcp4client v1.0.0/go.mod h1:j0hNfjhrt2SxUOw55nL0ATM/z4Yt3t2Kd1mW34z5W5s=
 github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5/go.mod h1:Eo87+Kg/IX2hfWJfwxMzLyuSZyxSoAug2nGa1G2QAi8=
@ -316,24 +311,28 @@ 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 v28.3.3+incompatible h1:fp9ZHAr1WWPGdIWBM1b3zLtgCF+83gRdVMTJsUeiyAo=
-github.com/docker/cli v28.3.3+incompatible/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=
 github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 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 v28.3.3+incompatible h1:Dypm25kh4rmk49v1eiVbsAtpAsYURjYkaKubwuBdxEI=
-github.com/docker/docker v28.3.3+incompatible/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=
-github.com/docker/docker-credential-helpers v0.9.3 h1:gAm/VtF9wgqJMoxzT3Gj5p4AqIjCBS4wrsOh9yRqcz8=
-github.com/docker/docker-credential-helpers v0.9.3/go.mod h1:x+4Gbw9aGmChi3qTLZj8Dfn0TD20M/fuWy0E5+WDeCo=
+github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo=
+github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M=
 github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c h1:lzqkGL9b3znc+ZUgi7FlLnqjQhcXxkNM/quxIjBVMD0=
 github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c/go.mod h1:CADgU4DSXK5QUlFslkQu2yW2TKzFZcXq/leZfM0UH5Q=
 github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
-github.com/docker/go-connections v0.6.0 h1:LlMG9azAe1TqfR7sO+NJttz1gy6KO7VJBh+pMmjSD94=
-github.com/docker/go-connections v0.6.0/go.mod h1:AahvXYshr6JgfUJGdDCs2b5EZG/vmaMAntpSFH5BFKE=
+github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
+github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
 github.com/docker/go-events v0.0.0-20170721190031-9461782956ad/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA=
 github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA=
 github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916/go.mod h1:/u0gXw0Gay3ceNrsHubL3BtdOL2fHf93USgMTe0W5dI=
@ -351,8 +350,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 v1.7.2 h1:Y2o6urb7Eule09PjlhQRGNsqRfPmYI3KKQLFpCAV3+o=
-github.com/elazarl/goproxy v1.7.2/go.mod h1:82vkLNir0ALaW14Rc399OTTjyNREgmdL2cVoIbS6XaE=
+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/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=
@ -363,8 +362,6 @@ 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=
@ -376,6 +373,8 @@ github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoD
 github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
+github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
+github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
 github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXtdwXqoenmZCw6S+25EAm2MkxbG0deNDu4cbSA=
 github.com/fvbommel/sortorder v1.1.0 h1:fUmoe+HLsBTctBDoaBwpQo5N+nrCp8g/BjKb/6ZQmYw=
 github.com/fvbommel/sortorder v1.1.0/go.mod h1:uk88iVf1ovNn1iLfgUVU2F9o5eO30ui720w+kxuqRs0=
@ -383,16 +382,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.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c=
-github.com/gliderlabs/ssh v0.3.8/go.mod h1:xYoytBv1sV0aL3CavoDuJIQNURXkkfPA/wxQ1pL1fAU=
+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/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.2 h1:6Q86EsPXMa7c3YZ3aLAQsMA0VlWmy43r6FHqa/UNbRM=
-github.com/go-git/go-billy/v5 v5.6.2/go.mod h1:rcFC2rAsp/erv7CMz9GczHcuD0D32fWzH+MJAU+jaUU=
+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-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.16.2 h1:fT6ZIOjE5iEnkzKyxTHK1W4HGAsPhqEqiSAssSO77hM=
-github.com/go-git/go-git/v5 v5.16.2/go.mod h1:4Ge4alE/5gPs30F2H1esi2gPd69R0C39lolkucHBOp8=
+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-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=
@ -406,8 +405,8 @@ github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KE
 github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
 github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
-github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
+github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0=
@ -421,10 +420,11 @@ github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8
 github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I=
 github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
+github.com/go-sql-driver/mysql v1.3.0 h1:pgwjLi/dvffoP9aabwkT3AKpXQM93QARkjFhDDqC1UE=
 github.com/go-sql-driver/mysql v1.3.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs=
-github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
+github.com/go-viper/mapstructure/v2 v2.2.1 h1:ZAaOCxANMuZx5RCeg0mBdEZk7DZasvvZIxtHqx8aGss=
+github.com/go-viper/mapstructure/v2 v2.2.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
 github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
 github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
 github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4=
@ -476,6 +476,7 @@ github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek
 github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/certificate-transparency-go v1.0.10-0.20180222191210-5ab67e519c93 h1:jc2UWq7CbdszqeH6qu1ougXMIUBfSy8Pbh/anURYbGI=
 github.com/google/certificate-transparency-go v1.0.10-0.20180222191210-5ab67e519c93/go.mod h1:QeJfpSbVSfYc7RgB3gJFj9cbuQMMchQxrWXz8Ruopmg=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
@ -487,8 +488,8 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
-github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-containerregistry v0.5.1/go.mod h1:Ct15B4yir3PLOP5jsy0GNeYVaIZs/MK/Jz5any1wFW0=
 github.com/google/go-intervals v0.0.2/go.mod h1:MkaR3LNRfeKLPmqgJYs4E66z5InYjmCjbbr4TQlcT6Y=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@ -528,9 +529,13 @@ 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.27.1 h1:X5VWvz21y3gzm9Nw/kaUeku/1+uBhcekkmy4IkffJww=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1/go.mod h1:Zanoh4+gvIgluNqcfMVTJueD4wSS5hT7zTt4Mrutd90=
+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=
 github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4=
 github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
@ -541,10 +546,11 @@ github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVH
 github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I=
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
-github.com/hashicorp/go-retryablehttp v0.7.8 h1:ylXZWnqa7Lhqpk0L1P1LzDtGcCR0rPVUrx/c8Unxc48=
-github.com/hashicorp/go-retryablehttp v0.7.8/go.mod h1:rjiScheydd+CxvumBsIrFKlx3iS0jrZ7LvzFGFmuKbw=
+github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU=
+github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec h1:qv2VnGeEQHchGaZ/u7lxST/RaJw+cv273q79D81Xbog=
 github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec/go.mod h1:Q48J4R4DvxnHolD5P8pOtXigYlRuPLGl6moFx3ulM68=
@ -561,7 +567,9 @@ github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLf
 github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod h1:ymszkNOg6tORTn+6F6j+Jc8TOr5osrynvN6ivFWZ2GA=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
+github.com/jinzhu/gorm v0.0.0-20170222002820-5409931a1bb8 h1:CZkYfurY6KGhVtlalI4QwQ6T0Cu6iuY3e0x5RLu96WE=
 github.com/jinzhu/gorm v0.0.0-20170222002820-5409931a1bb8/go.mod h1:Vla75njaFJ8clLU1W44h34PjIkijhjHIYnZxMqCdxqo=
+github.com/jinzhu/inflection v0.0.0-20170102125226-1c35d901db3d h1:jRQLvyVGL+iVtDElaEIDdKwpPqUIZJfzkNLV34htpEc=
 github.com/jinzhu/inflection v0.0.0-20170102125226-1c35d901db3d/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 github.com/jinzhu/now v1.1.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
@ -588,8 +596,8 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o
 github.com/klauspost/compress v1.11.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/klauspost/compress v1.11.13/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/klauspost/compress v1.14.2/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
-github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
-github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
+github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
+github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
 github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@ -607,13 +615,12 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
-github.com/leonelquinteros/gotext v1.7.2 h1:bDPndU8nt+/kRo1m4l/1OXiiy2v7Z7dfPQ9+YP7G1Mc=
-github.com/leonelquinteros/gotext v1.7.2/go.mod h1:9/haCkm5P7Jay1sxKDGJ5WIg4zkz8oZKw4ekNpALob8=
 github.com/lib/pq v0.0.0-20150723085316-0dad96c0b94f/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/linuxkit/virtsock v0.0.0-20201010232012-f8cee7dfc7a3/go.mod h1:3r6x7q95whyfWQpmGZTu3gk3v2YkMi05HEzl7Tf7YEo=
 github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
 github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
 github.com/magiconair/properties v1.5.3/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
+github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
@ -622,14 +629,13 @@ github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7
 github.com/marstr/guid v1.1.0/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHefzho=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
-github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
-github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
+github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+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.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
 github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
@ -653,33 +659,31 @@ github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod h1:l0
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/mapstructure v0.0.0-20150613213606-2caf8efc9366/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+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/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/go-archive v0.1.0 h1:Kk/5rdW/g+H8NHdJW2gsXyZ7UnzvJNOy6VKJqueWdcQ=
-github.com/moby/go-archive v0.1.0/go.mod h1:G9B+YoujNohJmrIYFBpSd54GTUB4lt9S+xVQvsJyFuo=
 github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc=
 github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk=
 github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
-github.com/moby/sys/atomicwriter v0.1.0 h1:kw5D/EqkBwsBFi0ss9v1VG3wIkVhzGvLklJ+w3A14Sw=
-github.com/moby/sys/atomicwriter v0.1.0/go.mod h1:Ul8oqv2ZMNHOceF643P6FKPXeCmYtlQMvpizfsSoaWs=
 github.com/moby/sys/mountinfo v0.4.0/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A=
 github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A=
 github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU=
-github.com/moby/sys/mountinfo v0.7.2 h1:1shs6aH5s4o5H2zQLn796ADW1wMrIwHsyJ2v9KouLrg=
-github.com/moby/sys/mountinfo v0.7.2/go.mod h1:1YOa8w8Ih7uW0wALDUgT1dTTSBrZ+HiBLGws92L2RU4=
+github.com/moby/sys/mountinfo v0.6.2 h1:BzJjoreD5BMFNmD9Rus6gdd1pLuecOFPt8wC+Vygl78=
+github.com/moby/sys/mountinfo v0.6.2/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI=
 github.com/moby/sys/sequential v0.6.0 h1:qrx7XFUd/5DxtqcoH1h438hF5TmOvzC/lspjy7zgvCU=
 github.com/moby/sys/sequential v0.6.0/go.mod h1:uyv8EUTrca5PnDsdMGXhZe6CCe8U/UiTWd+lL+7b/Ko=
 github.com/moby/sys/signal v0.7.1 h1:PrQxdvxcGijdo6UXXo/lU/TvHUWyPhj7UOpSo8tuvk0=
 github.com/moby/sys/signal v0.7.1/go.mod h1:Se1VGehYokAkrSQwL4tDzHvETwUZlnY7S5XtQ50mQp8=
 github.com/moby/sys/symlink v0.1.0/go.mod h1:GGDODQmbFOjFsXvfLVn3+ZRxkch54RkSiGqsZeMYowQ=
-github.com/moby/sys/user v0.4.0 h1:jhcMKit7SA80hivmFJcbB1vqmw//wU61Zdui2eQXuMs=
-github.com/moby/sys/user v0.4.0/go.mod h1:bG+tYYYJgaMtRKgEmuueC0hJEAZWwtIbZTB+85uoHjs=
+github.com/moby/sys/user v0.3.0 h1:9ni5DlcW5an3SvRSx4MouotOygvzaXbaSrc/wGDFWPo=
+github.com/moby/sys/user v0.3.0/go.mod h1:bG+tYYYJgaMtRKgEmuueC0hJEAZWwtIbZTB+85uoHjs=
 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.2 h1:6qk3FJAFDs6i/q3W/pQ97SX192qKfZgGjCQqfCJkgzQ=
-github.com/moby/term v0.5.2/go.mod h1:d3djjFCrjnB+fl8NJux+EJzu0msscUP+f8it8hPkFLc=
+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/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=
@ -688,12 +692,8 @@ 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/termenv v0.16.0 h1:S5AlUN9dENB57rsbnkPyfdGuWIlkmzJjbFf0Tf5FWUc=
-github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk=
+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=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
@ -730,8 +730,8 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/opencontainers/image-spec v1.0.0/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
 github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
-github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040=
-github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M=
+github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=
+github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
 github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
 github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
 github.com/opencontainers/runc v1.0.0-rc8.0.20190926000215-3e425f80a8c9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
@ -754,12 +754,15 @@ github.com/opencontainers/selinux v1.6.0/go.mod h1:VVGKuOLlE7v4PJyT6h7mNWvq1rzqi
 github.com/opencontainers/selinux v1.8.0/go.mod h1:RScLhm78qiWa2gbVCcGkC7tCGdgk3ogry1nUQF8Evvo=
 github.com/opencontainers/selinux v1.8.2/go.mod h1:MUIHuUEvKB1wtJjQdOyYRgOnLD2xAPP8dBsCoU0KuF8=
 github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI=
+github.com/opentracing/opentracing-go v1.1.0 h1:pWlfV3Bxv7k65HYwkikxat0+s3pV4bsqf19k25Ur8rU=
 github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc=
+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.4.0 h1:NXzbL1RvjTUi6kgYZCX3fPwwl27Q1LJndxtUDVfJGRY=
-github.com/pjbgf/sha1cd v0.4.0/go.mod h1:zQWigSxVmsHEZow5qaLtPYxpcKMMQpa09ixqBxuCS6A=
+github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4=
+github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI=
 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=
@ -775,23 +778,25 @@ github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDf
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
 github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g=
 github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
-github.com/prometheus/client_golang v1.23.0 h1:ust4zpdl9r4trLY/gSjlm07PuiBq2ynaXXlptpfy8Uc=
-github.com/prometheus/client_golang v1.23.0/go.mod h1:i/o0R9ByOnHX0McrTMTyhYvKE4haaf2mW08I+jGAjEE=
+github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y=
+github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
 github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
-github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
+github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
+github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
 github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 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.65.0 h1:QDwzd+G1twt//Kwj/Ww6E9FQq1iVMmODnILtW1t2VzE=
-github.com/prometheus/common v0.65.0/go.mod h1:0gZns+BLRQ3V6NdaerOhMbwwRbNh9hkGINtQAsP5GS8=
+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=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
@ -803,8 +808,8 @@ github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+Gx
 github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
-github.com/prometheus/procfs v0.17.0 h1:FuLQ+05u4ZI+SS/w9+BWEM2TXiHKsUQ9TADiRH7DuK0=
-github.com/prometheus/procfs v0.17.0/go.mod h1:oPQLaDAMRbA+u8H5Pbfq+dl3VDAvHxMUOVhe0wYB2zw=
+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.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
@ -812,20 +817,21 @@ github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUc
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
-github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
+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=
 github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
-github.com/schollz/progressbar/v3 v3.18.0 h1:uXdoHABRFmNIjUfte/Ex7WtuyVslrw2wVPQmCN62HpA=
-github.com/schollz/progressbar/v3 v3.18.0/go.mod h1:IsO3lpbaGuzh8zIMzgY3+J8l4C8GjO0Y9S69eFvNsec=
+github.com/schollz/progressbar/v3 v3.17.1 h1:bI1MTaoQO+v5kzklBjYNRQLoVpe0zbyRZNK6DFkVC5U=
+github.com/schollz/progressbar/v3 v3.17.1/go.mod h1:RzqpnsPQNjUyIgdglUjRLgD7sVnxN1wpmBMV+UiEbL4=
 github.com/sclevine/spec v1.2.0/go.mod h1:W4J29eT/Kzv7/b9IWLB055Z+qvVC9vt0Arko24q7p+U=
 github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo=
 github.com/seccomp/libseccomp-golang v0.9.2-0.20210429002308-3879420cc921/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg=
-github.com/sergi/go-diff v1.4.0 h1:n/SP9D5ad1fORl+llWyN+D6qoUETXNZARKjyY2/KVCw=
-github.com/sergi/go-diff v1.4.0/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
+github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
+github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
 github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
@ -837,34 +843,36 @@ github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic
 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/skeema/knownhosts v1.3.1 h1:X2osQ+RAjK76shCbvhHHHVl3ZlgDm8apHEHFqRjnBY8=
-github.com/skeema/knownhosts v1.3.1/go.mod h1:r7KTdC8l4uxWRyK2TpQZ/1o5HaSzh06ePQNxPwTcfiY=
+github.com/skeema/knownhosts v1.3.0 h1:AM+y0rI04VksttfwjkSTNQorvGqmwATnvnAHpSgc0LY=
+github.com/skeema/knownhosts v1.3.0/go.mod h1:sPINvnADmT/qYH1kfv+ePMmOBTH6Tbl7b5LvTDjFK7M=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
+github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc=
 github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
 github.com/spf13/cast v0.0.0-20150508191742-4d07383ffe94/go.mod h1:r2rcYCSwa1IExKTDiTfzaxqT2FNHs8hODu4LnUfgKEg=
+github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8=
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cobra v0.0.1/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE=
-github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
-github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
+github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
+github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
 github.com/spf13/jwalterweatherman v0.0.0-20141219030609-3d60171a6431/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
+github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk=
 github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
 github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.0/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/pflag v1.0.7 h1:vN6T9TfwStFPFM5XzjsvmzZkLuaLX+HS+0SeFLRgU6M=
-github.com/spf13/pflag v1.0.7/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/viper v0.0.0-20150530192845-be5ff3e4840c/go.mod h1:A8kyI5cUJhb8N+3pkfONlcEcZbueH6nhAm0Fq7SrnBM=
+github.com/spf13/viper v1.4.0 h1:yXHLWeravcrgGyFSyCgdYpXQ9dR9c/WED3pg1RhxqEU=
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod h1:AO3tvPzVZ/ayst6UlUKUv6rcPQInYe3IknH3jYhAKu8=
 github.com/stretchr/objx v0.0.0-20180129172003-8a3f7159479f/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@ -897,6 +905,8 @@ 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=
@ -917,8 +927,6 @@ github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod h1:5yf
 github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74=
 github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
-github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
-github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@ -939,29 +947,49 @@ 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.62.0 h1:Hf9xI/XLML9ElpiHVDNwvqI0hIFlzV8dgIr35kV1kRU=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0/go.mod h1:NfchwuyNoMcZ5MLHwPrODwUF1HWCXWrL31s8gSAdIKY=
-go.opentelemetry.io/otel v1.37.0 h1:9zhNfelUvx0KBfu/gb+ZgeAfAgtWrfHJZcAqFC228wQ=
-go.opentelemetry.io/otel v1.37.0/go.mod h1:ehE/umFRLnuLa/vSccNq9oS1ErUlkkK71gMcN34UG8I=
-go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.37.0 h1:zG8GlgXCJQd5BU98C0hZnBbElszTmUgCNCfYneaDL0A=
-go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.37.0/go.mod h1:hOfBCz8kv/wuq73Mx2H2QnWokh/kHZxkh6SNF2bdKtw=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0 h1:Ahq7pZmv87yiyn3jeFz/LekZmPLLdKejuO3NcK9MssM=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0/go.mod h1:MJTqhM0im3mRLw1i8uGHnCvUEeS7VwRyxlLC78PA18M=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0 h1:EtFWSnwW9hGObjkIdmlnWSydO+Qs8OwzfzXLUPg4xOc=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0/go.mod h1:QjUEoiGCPkvFZ/MjK6ZZfNOS6mfVEVKYE99dFhuN2LI=
+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.37.0 h1:mvwbQS5m0tbmqML4NqK+e3aDiO02vsf/WgbsdpcPoZE=
-go.opentelemetry.io/otel/metric v1.37.0/go.mod h1:04wGrZurHYKOc+RKeye86GwKiTb9FKm1WHtO+4EVr2E=
-go.opentelemetry.io/otel/sdk v1.37.0 h1:ItB0QUqnjesGRvNcmAcU0LyvkVyGJ2xftD29bWdDvKI=
-go.opentelemetry.io/otel/sdk v1.37.0/go.mod h1:VredYzxUvuo2q3WRcDnKDjbdvmO0sCzOvVAiY+yUkAg=
-go.opentelemetry.io/otel/sdk/metric v1.37.0 h1:90lI228XrB9jCMuSdA0673aubgRobVZFhbjxHHspCPc=
-go.opentelemetry.io/otel/sdk/metric v1.37.0/go.mod h1:cNen4ZWfiD37l5NhS+Keb5RXVWZWpRE+9WyVCpbo5ps=
-go.opentelemetry.io/otel/trace v1.37.0 h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mxVK7z4=
-go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0=
+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.7.1 h1:gTOMpGDb0WTBOP8JaO72iL3auEZhVmAQg4ipjOVAtj4=
-go.opentelemetry.io/proto/otlp v1.7.1/go.mod h1:b2rVh6rfI/s2pHWNlB7ILJcRALpcNDzKhACevjI+ZnE=
+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.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=
@ -986,8 +1014,10 @@ 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.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4=
-golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc=
+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/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=
@ -998,8 +1028,10 @@ 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-20250813145105-42675adae3e6 h1:SbTAbRFnd5kjQXbczszQ0hdk3ctwYf3qBNH9jIsGclE=
-golang.org/x/exp v0.0.0-20250813145105-42675adae3e6/go.mod h1:4QTo5u+SEIbbKW1RacMZq1YEfOBqeXa19JeshGi+zc4=
+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/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=
@ -1063,8 +1095,10 @@ 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.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
-golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
+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/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=
@ -1082,8 +1116,10 @@ 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.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
-golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+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=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@ -1153,7 +1189,6 @@ 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=
@ -1161,14 +1196,20 @@ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+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.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
-golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+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/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.34.0 h1:O/2T7POpk0ZZ7MAzMeWFSg6S5IpWd/RXDlM9hgM3DR4=
-golang.org/x/term v0.34.0/go.mod h1:5jC53AEywhIVebHgPVeg0mj8OD3VO9OzclacVrqpaAw=
+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/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=
@ -1178,16 +1219,18 @@ 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.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
-golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
+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=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 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.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
-golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
+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/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=
@ -1281,10 +1324,14 @@ 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-20250811230008-5f3141c8851a h1:DMCgtIAIQGZqJXMVzJF4MV8BlWoJh2ZuFiRdAleyr58=
-google.golang.org/genproto/googleapis/api v0.0.0-20250811230008-5f3141c8851a/go.mod h1:y2yVLIE/CSMCPXaHnSKXxu1spLPnglFLegmgdY23uuE=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250811230008-5f3141c8851a h1:tPE/Kp+x9dMSwUm/uM0JKK0IfdiJkwAbSMSeZBXXJXc=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250811230008-5f3141c8851a/go.mod h1:gw1tLEfykwDz2ET4a12jcXt4couGAm7IwsVaTy0Sflo=
+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/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=
@ -1304,8 +1351,10 @@ 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.74.2 h1:WoosgB65DlWVC9FqI82dGsZhWFNBSLjQ84bjROOpMu4=
-google.golang.org/grpc v1.74.2/go.mod h1:CtQ+BGjaAIXHs/5YS3i473GqwBBa1zGQNevxdeBEXrM=
+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=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@ -1319,10 +1368,13 @@ 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.36.7 h1:IgrO7UwFQGJdRNXH/sQux4R1Dj1WAKcLElzeeRaXV2A=
-google.golang.org/protobuf v1.36.7/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
+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=
 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=
 gopkg.in/cenkalti/backoff.v2 v2.2.1/go.mod h1:S0QdOvT2AlerfSBkp0O+dk+bbIMaNbEmVk876gPCthU=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20141024133853-64131543e789/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@ -1338,6 +1390,7 @@ gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKW
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
+gopkg.in/rethinkdb/rethinkdb-go.v6 v6.2.1 h1:d4KQkxAaAiRY2h5Zqis161Pv91A37uZyJOx73duwUwM=
 gopkg.in/rethinkdb/rethinkdb-go.v6 v6.2.1/go.mod h1:WbjuEoo1oadwzQ4apSDU+JTvmllEHtsNHS6y7vFc7iw=
 gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
 gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
@ -1358,11 +1411,12 @@ 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=
-gotest.tools/v3 v3.5.2 h1:7koQfIKdy+I8UTetycgUqXWSDwpgv193Ka+qRsmBY8Q=
-gotest.tools/v3 v3.5.2/go.mod h1:LtdLGcnqToBH83WByAAi/wiwSFCArdFIUV/xxN4pcjA=
+gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU=
+gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
--- a/pkg/app/app.go
+++ b/pkg/app/app.go
@ -36,7 +36,7 @@ func Get(appName string) (App, error) {
 		return App{}, err
 	}

-	log.Debugf("loaded app %s: %s", appName, app)
+	log.Debugf("retrieved %s for %s", app, appName)

 	return app, nil
 }
@ -91,17 +91,6 @@ 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
@ -246,6 +235,8 @@ 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())
@ -426,9 +417,7 @@ func GetAppStatuses(apps []App, MachineReadable bool) (map[string]map[string]str
 	for server := range servers {
 		cl, err := client.New(server)
 		if err != nil {
-			log.Warn(err)
-			ch <- stack.StackStatus{}
-			continue
+			return statuses, err
 		}

 		go func(s string) {
@ -505,13 +494,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("adding env vars to %s service config", stackName)
+			log.Debugf("add the following environment to the app service config of %s:", stackName)
 			for k, v := range appEnv {
 				_, exists := service.Environment[k]
 				if !exists {
 					value := v
 					service.Environment[k] = &value
-					log.Debugf("%s: %s: %s", stackName, k, value)
+					log.Debugf("add env var: %s value: %s to %s", k, value, stackName)
 				}
 			}
 		}
@ -580,49 +569,6 @@ func ReadAbraShCmdNames(abraSh string) ([]string, error) {
 	return cmdNames, nil
 }

-// 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()
-
-	var (
-		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
-		}
-
-		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 {
@ -630,13 +576,9 @@ func (a App) WriteRecipeVersion(version string, dryRun bool) error {
 	}
 	defer file.Close()

-	var (
-		dirtyVersion string
-		skipped      bool
-		lines        []string
-		scanner      = bufio.NewScanner(file)
-	)
-
+	skipped := false
+	scanner := bufio.NewScanner(file)
+	lines := []string{}
 	for scanner.Scan() {
 		line := scanner.Text()
 		if !strings.HasPrefix(line, "RECIPE=") && !strings.HasPrefix(line, "TYPE=") {
@ -649,14 +591,13 @@ func (a App) WriteRecipeVersion(version string, dryRun bool) error {
 			continue
 		}

-		if strings.Contains(line, version) && !a.Recipe.Dirty && !strings.HasSuffix(line, config.DIRTY_DEFAULT) {
+		if strings.Contains(line, version) {
 			skipped = true
 			lines = append(lines, line)
 			continue
 		}

 		splitted := strings.Split(line, ":")
-
 		line = fmt.Sprintf("%s:%s", splitted[0], version)
 		lines = append(lines, line)
 	}
@ -665,10 +606,6 @@ 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)
--- a/pkg/app/app_test.go
+++ b/pkg/app/app_test.go
@ -198,29 +198,3 @@ 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)
-}
--- a/pkg/app/compose.go
+++ b/pkg/app/compose.go
@ -44,16 +44,6 @@ func SetChaosVersionLabel(compose *composetypes.Config, stackName string, chaosV
 	}
 }

-func SetVersionLabel(compose *composetypes.Config, stackName string, version string) {
-	for _, service := range compose.Services {
-		if service.Name == "app" {
-			log.Debugf("set label 'coop-cloud.%s.version' to %v for %s", stackName, version, stackName)
-			labelKey := fmt.Sprintf("coop-cloud.%s.version", stackName)
-			service.Deploy.Labels[labelKey] = version
-		}
-	}
-}
-
 // SetUpdateLabel adds env ENABLE_AUTO_UPDATE as label to enable/disable the
 // auto update process for this app. The default if this variable is not set is to disable
 // the auto update process.
--- a/pkg/autocomplete/autocomplete.go
+++ b/pkg/autocomplete/autocomplete.go
@ -1,12 +1,12 @@
 package autocomplete

 import (
+	"fmt"
 	"sort"

 	"coopcloud.tech/abra/pkg/app"
 	appPkg "coopcloud.tech/abra/pkg/app"
 	"coopcloud.tech/abra/pkg/recipe"
-	"github.com/leonelquinteros/gotext"
 	"github.com/spf13/cobra"
 )

@ -14,7 +14,7 @@ import (
 func AppNameComplete() ([]string, cobra.ShellCompDirective) {
 	appFiles, err := app.LoadAppFiles("")
 	if err != nil {
-		err := gotext.Get("autocomplete failed: %s", err)
+		err := fmt.Sprintf("autocomplete failed: %s", err)
 		return []string{err}, cobra.ShellCompDirectiveError
 	}

@ -29,7 +29,7 @@ func AppNameComplete() ([]string, cobra.ShellCompDirective) {
 func ServiceNameComplete(appName string) ([]string, cobra.ShellCompDirective) {
 	serviceNames, err := app.GetAppServiceNames(appName)
 	if err != nil {
-		err := gotext.Get("autocomplete failed: %s", err)
+		err := fmt.Sprintf("autocomplete failed: %s", err)
 		return []string{err}, cobra.ShellCompDirectiveError
 	}

@ -40,7 +40,7 @@ func ServiceNameComplete(appName string) ([]string, cobra.ShellCompDirective) {
 func RecipeNameComplete() ([]string, cobra.ShellCompDirective) {
 	catl, err := recipe.ReadRecipeCatalogue(false)
 	if err != nil {
-		err := gotext.Get("autocomplete failed: %s", err)
+		err := fmt.Sprintf("autocomplete failed: %s", err)
 		return []string{err}, cobra.ShellCompDirectiveError
 	}

@ -54,9 +54,9 @@ func RecipeNameComplete() ([]string, cobra.ShellCompDirective) {

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

@ -74,7 +74,7 @@ func RecipeVersionComplete(recipeName string) ([]string, cobra.ShellCompDirectiv
 func ServerNameComplete() ([]string, cobra.ShellCompDirective) {
 	files, err := app.LoadAppFiles("")
 	if err != nil {
-		err := gotext.Get("autocomplete failed: %s", err)
+		err := fmt.Sprintf("autocomplete failed: %s", err)
 		return []string{err}, cobra.ShellCompDirectiveError
 	}

@ -90,13 +90,13 @@ func ServerNameComplete() ([]string, cobra.ShellCompDirective) {
 func CommandNameComplete(appName string) ([]string, cobra.ShellCompDirective) {
 	app, err := app.Get(appName)
 	if err != nil {
-		err := gotext.Get("autocomplete failed: %s", err)
+		err := fmt.Sprintf("autocomplete failed: %s", err)
 		return []string{err}, cobra.ShellCompDirectiveError
 	}

 	cmdNames, err := appPkg.ReadAbraShCmdNames(app.Recipe.AbraShPath)
 	if err != nil {
-		err := gotext.Get("autocomplete failed: %s", err)
+		err := fmt.Sprintf("autocomplete failed: %s", err)
 		return []string{err}, cobra.ShellCompDirectiveError
 	}

@ -111,7 +111,7 @@ func SecretComplete(recipeName string) ([]string, cobra.ShellCompDirective) {

 	config, err := r.GetComposeConfig(nil)
 	if err != nil {
-		err := gotext.Get("autocomplete failed: %s", err)
+		err := fmt.Sprintf("autocomplete failed: %s", err)
 		return []string{err}, cobra.ShellCompDirectiveError
 	}

--- a/pkg/catalogue/catalogue.go
+++ b/pkg/catalogue/catalogue.go
@ -1,7 +1,6 @@
 package catalogue

 import (
-	"errors"
 	"fmt"
 	"os"
 	"path"
@ -11,19 +10,19 @@ import (
 	gitPkg "coopcloud.tech/abra/pkg/git"
 	"coopcloud.tech/abra/pkg/log"
 	"github.com/go-git/go-git/v5"
-	"github.com/leonelquinteros/gotext"
 )

 // EnsureCatalogue ensures that the catalogue is cloned locally & present.
 func EnsureCatalogue() error {
 	catalogueDir := path.Join(config.ABRA_DIR, "catalogue")
 	if _, err := os.Stat(catalogueDir); err != nil && os.IsNotExist(err) {
-		log.Debug(gotext.Get("catalogue is missing, retrieving now"))
-
+		log.Warnf("local recipe 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
@ -37,7 +36,8 @@ func EnsureIsClean() error {
 	}

 	if !isClean {
-		return errors.New(gotext.Get("%s has locally unstaged changes? please commit/remove your changes before proceeding", config.CATALOGUE_DIR))
+		msg := "%s has locally unstaged changes? please commit/remove your changes before proceeding"
+		return fmt.Errorf(msg, config.CATALOGUE_DIR)
 	}

 	return nil
@ -56,7 +56,8 @@ func EnsureUpToDate() error {
 	}

 	if len(remotes) == 0 {
-		log.Debug(gotext.Get("cannot ensure %s is up-to-date, no git remotes configured", config.CATALOGUE_DIR))
+		msg := "cannot ensure %s is up-to-date, no git remotes configured"
+		log.Debugf(msg, config.CATALOGUE_DIR)
 		return nil
 	}

@ -81,7 +82,7 @@ func EnsureUpToDate() error {
 		}
 	}

-	log.Debug(gotext.Get("fetched latest git changes for %s", config.CATALOGUE_DIR))
+	log.Debugf("fetched latest git changes for %s", config.CATALOGUE_DIR)

 	return nil
 }
--- a/pkg/client/client.go
+++ b/pkg/client/client.go
@ -4,6 +4,7 @@ package client
 import (
 	"context"
 	"errors"
+	"fmt"
 	"net/http"
 	"os"
 	"time"
@ -13,7 +14,6 @@ import (
 	sshPkg "coopcloud.tech/abra/pkg/ssh"
 	commandconnPkg "coopcloud.tech/abra/pkg/upstream/commandconn"
 	"github.com/docker/docker/client"
-	"github.com/leonelquinteros/gotext"
 )

 // Conf is a Docker client configuration.
@ -41,7 +41,7 @@ func New(serverName string, opts ...Opt) (*client.Client, error) {
 	if serverName != "default" {
 		context, err := GetContext(serverName)
 		if err != nil {
-			return nil, errors.New(gotext.Get("unknown server, run \"abra server add %s\"?", serverName))
+			return nil, fmt.Errorf("unknown server, run \"abra server add %s\"?", serverName)
 		}

 		ctxEndpoint, err := contextPkg.GetContextEndpoint(context)
@ -85,7 +85,7 @@ func New(serverName string, opts ...Opt) (*client.Client, error) {
 		return nil, err
 	}

-	log.Debug(gotext.Get("created client for %s", serverName))
+	log.Debugf("created client for %s", serverName)

 	info, err := cl.Info(context.Background())
 	if err != nil {
@ -94,10 +94,10 @@ func New(serverName string, opts ...Opt) (*client.Client, error) {

 	if info.Swarm.LocalNodeState == "inactive" {
 		if serverName != "default" {
-			return cl, errors.New(gotext.Get("swarm mode not enabled on %s?", serverName))
+			return cl, fmt.Errorf("swarm mode not enabled on %s?", serverName)
 		}

-		return cl, errors.New(gotext.Get("swarm mode not enabled on local server?"))
+		return cl, errors.New("swarm mode not enabled on local server?")
 	}

 	return cl, nil
--- a/pkg/client/configs.go
+++ b/pkg/client/configs.go
@ -1,39 +0,0 @@
-package client
-
-import (
-	"context"
-	"errors"
-
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/client"
-	"github.com/leonelquinteros/gotext"
-)
-
-func GetConfigs(cl *client.Client, ctx context.Context, server string, fs filters.Args) ([]swarm.Config, error) {
-	configList, err := cl.ConfigList(ctx, swarm.ConfigListOptions{Filters: fs})
-	if err != nil {
-		return configList, err
-	}
-
-	return configList, nil
-}
-
-func GetConfigNames(configs []swarm.Config) []string {
-	var confNames []string
-
-	for _, conf := range configs {
-		confNames = append(confNames, conf.Spec.Name)
-	}
-
-	return confNames
-}
-
-func RemoveConfigs(cl *client.Client, ctx context.Context, configNames []string, force bool) error {
-	for _, confName := range configNames {
-		if err := cl.ConfigRemove(context.Background(), confName); err != nil {
-			return errors.New(gotext.Get("conf %s: %s", confName, err))
-		}
-	}
-	return nil
-}
--- a/pkg/client/context.go
+++ b/pkg/client/context.go
@ -10,7 +10,6 @@ import (
 	dConfig "github.com/docker/cli/cli/config"
 	"github.com/docker/cli/cli/context/docker"
 	contextStore "github.com/docker/cli/cli/context/store"
-	"github.com/leonelquinteros/gotext"
 )

 type Context = contextStore.Metadata
@ -23,7 +22,7 @@ func CreateContext(contextName string) error {
 		return err
 	}

-	log.Debug(gotext.Get("created the %s context", contextName))
+	log.Debugf("created the %s context", contextName)

 	return nil
 }
@ -63,7 +62,7 @@ func createContext(name string, host string) error {

 func DeleteContext(name string) error {
 	if name == "default" {
-		return errors.New(gotext.Get("context 'default' cannot be removed"))
+		return errors.New("context 'default' cannot be removed")
 	}

 	if _, err := GetContext(name); err != nil {
--- a/pkg/client/registry.go
+++ b/pkg/client/registry.go
@ -2,13 +2,11 @@ package client

 import (
 	"context"
-	"errors"
 	"fmt"

 	"github.com/containers/image/docker"
 	"github.com/containers/image/types"
 	"github.com/distribution/reference"
-	"github.com/leonelquinteros/gotext"
 )

 // GetRegistryTags retrieves all tags of an image from a container registry.
@ -17,7 +15,7 @@ func GetRegistryTags(img reference.Named) ([]string, error) {

 	ref, err := docker.ParseReference(fmt.Sprintf("//%s", img))
 	if err != nil {
-		return tags, errors.New(gotext.Get("failed to parse image %s, saw: %s", img, err.Error()))
+		return tags, fmt.Errorf("failed to parse image %s, saw: %s", img, err.Error())
 	}

 	ctx := context.Background()
--- a/pkg/client/volumes.go
+++ b/pkg/client/volumes.go
@ -2,7 +2,6 @@ package client

 import (
 	"context"
-	"errors"
 	"fmt"
 	"time"

@ -10,7 +9,6 @@ import (
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/volume"
 	"github.com/docker/docker/client"
-	"github.com/leonelquinteros/gotext"
 )

 func GetVolumes(cl *client.Client, ctx context.Context, server string, fs filters.Args) ([]*volume.Volume, error) {
@ -56,9 +54,9 @@ func retryFunc(retries int, fn func() error) error {
 		}
 		if i+1 < retries {
 			sleep := time.Duration(i+1) * time.Duration(i+1)
-			log.Infof(gotext.Get("%s: waiting %d seconds before next retry", err, sleep))
+			log.Infof("%s: waiting %d seconds before next retry", err, sleep)
 			time.Sleep(sleep * time.Second)
 		}
 	}
-	return errors.New(gotext.Get("%d retries failed", retries))
+	return fmt.Errorf("%d retries failed", retries)
 }
--- a/pkg/config/abra.go
+++ b/pkg/config/abra.go
@ -6,7 +6,6 @@ import (
 	"path/filepath"

 	"coopcloud.tech/abra/pkg/log"
-	"github.com/leonelquinteros/gotext"
 	"gopkg.in/yaml.v3"
 )

@ -17,13 +16,13 @@ func LoadAbraConfig() Abra {
 	wd, _ := os.Getwd()
 	configFile := findAbraConfig(wd)
 	if configFile == "" {
-		log.Debug(gotext.Get("no config file found"))
+		log.Debugf("no config file found")
 		return Abra{}
 	}
 	data, err := os.ReadFile(configFile)
 	if err != nil {
 		// Do nothing, when an error occurs
-		log.Debug(gotext.Get("error reading config file: %s", err))
+		log.Debugf("error reading config file: %s", err)
 		return Abra{}
 	}

@ -31,10 +30,10 @@ func LoadAbraConfig() Abra {
 	err = yaml.Unmarshal(data, &config)
 	if err != nil {
 		// Do nothing, when an error occurs
-		log.Debug(gotext.Get("error loading config file: %s", err))
+		log.Debugf("error loading config file: %s", err)
 		return Abra{}
 	}
-	log.Debug(gotext.Get("config file loaded from: %s", configFile))
+	log.Debugf("config file loaded from: %s", configFile)
 	config.configPath = filepath.Dir(configFile)
 	return config
 }
@ -74,39 +73,40 @@ type Abra struct {
 // 3. use $HOME/.abra when above two options failed
 func (a Abra) GetAbraDir() string {
 	if dir, exists := os.LookupEnv("ABRA_DIR"); exists && dir != "" {
-		log.Debug(gotext.Get("read abra dir from $ABRA_DIR"))
+		log.Debug("read abra dir from $ABRA_DIR")
 		return dir
 	}
 	if a.AbraDir != "" {
-		log.Debug(gotext.Get("read abra dir from config file"))
+		log.Debug("read abra dir from config file")
 		if path.IsAbs(a.AbraDir) {
 			return a.AbraDir
 		}
 		// Make the path absolute
 		return path.Join(a.configPath, a.AbraDir)
 	}
-	log.Debug(gotext.Get("using default abra dir"))
+	log.Debug("using default abra dir")
 	return os.ExpandEnv("$HOME/.abra")
 }

 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") }

 var config = LoadAbraConfig()

 var (
-	ABRA_DIR                  = config.GetAbraDir()
-	SERVERS_DIR               = config.GetServersDir()
-	RECIPES_DIR               = config.GetRecipesDir()
-	LOGS_DIR                  = config.GetLogsDir()
-	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"
-	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"
+	ABRA_DIR                 = config.GetAbraDir()
+	SERVERS_DIR              = config.GetServersDir()
+	RECIPES_DIR              = config.GetRecipesDir()
+	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"

 	// 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,10 +114,6 @@ var (
 	// complained yet!
 	CHAOS_DEFAULT = "false"

-	DIRTY_DEFAULT = "+U"
-
 	NO_DOMAIN_DEFAULT  = "N/A"
 	NO_VERSION_DEFAULT = "N/A"
-
-	UNKNOWN_DEFAULT = "unknown"
 )
--- a/pkg/config/env.go
+++ b/pkg/config/env.go
@ -1,7 +1,7 @@
 package config

 import (
-	"errors"
+	"fmt"
 	"io/fs"
 	"io/ioutil"
 	"os"
@ -10,7 +10,6 @@ import (
 	"strings"

 	"coopcloud.tech/abra/pkg/log"
-	"github.com/leonelquinteros/gotext"
 )

 const MAX_SANITISED_APP_NAME_LENGTH = 45
@ -27,16 +26,9 @@ func GetServers() ([]string, error) {
 		return servers, err
 	}

-	var filtered []string
-	for _, s := range servers {
-		if !strings.HasPrefix(s, ".") {
-			filtered = append(filtered, s)
-		}
-	}
+	log.Debugf("retrieved %v servers: %s", len(servers), servers)

-	log.Debug(gotext.Get("retrieved %v servers: %s", len(filtered), filtered))
-
-	return filtered, nil
+	return servers, nil
 }

 // ReadServerNames retrieves all server names.
@ -47,7 +39,7 @@ func ReadServerNames() ([]string, error) {
 		return nil, err
 	}

-	log.Debug(gotext.Get("read %s from %s", strings.Join(serverNames, ","), SERVERS_DIR))
+	log.Debugf("read %s from %s", strings.Join(serverNames, ","), SERVERS_DIR)

 	return serverNames, nil
 }
@ -71,7 +63,7 @@ func GetAllFilesInDirectory(directory string) ([]fs.FileInfo, error) {

 		realPath, err := filepath.EvalSymlinks(filePath)
 		if err != nil {
-			log.Warnf(gotext.Get("broken symlink in your abra config folders: %s", filePath))
+			log.Warnf("broken symlink in your $ABRA_DIR: %s", filePath)
 		} else {
 			realFile, err := os.Stat(realPath)
 			if err != nil {
@ -95,7 +87,7 @@ func GetAllFoldersInDirectory(directory string) ([]string, error) {
 		return nil, err
 	}
 	if len(files) == 0 {
-		return nil, errors.New(gotext.Get("directory is empty: %s", directory))
+		return nil, fmt.Errorf("directory is empty: %s", directory)
 	}

 	for _, file := range files {
@ -104,7 +96,7 @@ func GetAllFoldersInDirectory(directory string) ([]string, error) {
 			filePath := path.Join(directory, file.Name())
 			realDir, err := filepath.EvalSymlinks(filePath)
 			if err != nil {
-				log.Warnf(gotext.Get("broken symlink in your abra config folders: %s", filePath))
+				log.Warnf("broken symlink in your abra config folders: %s", filePath)
 			} else if stat, err := os.Stat(realDir); err == nil && stat.IsDir() {
 				// path is a directory
 				folders = append(folders, file.Name())
--- a/pkg/container/container.go
+++ b/pkg/container/container.go
@ -2,7 +2,6 @@ package container

 import (
 	"context"
-	"errors"
 	"fmt"
 	"strings"

@ -13,7 +12,6 @@ import (
 	containerTypes "github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/client"
-	"github.com/leonelquinteros/gotext"
 )

 // GetContainer retrieves a container. If noInput is false and the retrievd
@ -28,7 +26,7 @@ func GetContainer(c context.Context, cl *client.Client, filters filters.Args, no

 	if len(containers) == 0 {
 		filter := filters.Get("name")[0]
-		return types.Container{}, errors.New(gotext.Get("no containers matching the %v filter found?", filter))
+		return types.Container{}, fmt.Errorf("no containers matching the %v filter found?", filter)
 	}

 	if len(containers) > 1 {
@ -37,19 +35,19 @@ func GetContainer(c context.Context, cl *client.Client, filters filters.Args, no
 			containerName := strings.Join(container.Names, " ")
 			trimmed := strings.TrimPrefix(containerName, "/")
 			created := formatter.HumanDuration(container.Created)
-			containersRaw = append(containersRaw, gotext.Get("%s (created %v)", trimmed, created))
+			containersRaw = append(containersRaw, fmt.Sprintf("%s (created %v)", trimmed, created))
 		}

 		if noInput {
-			err := errors.New(gotext.Get("expected 1 container but found %v: %s", len(containers), strings.Join(containersRaw, " ")))
+			err := fmt.Errorf("expected 1 container but found %v: %s", len(containers), strings.Join(containersRaw, " "))
 			return types.Container{}, err
 		}

-		log.Warnf(gotext.Get("ambiguous container list received, prompting for input"))
+		log.Warnf("ambiguous container list received, prompting for input")

 		var response string
 		prompt := &survey.Select{
-			Message: gotext.Get("which container are you looking for?"),
+			Message: "which container are you looking for?",
 			Options: containersRaw,
 		}

@ -66,7 +64,7 @@ func GetContainer(c context.Context, cl *client.Client, filters filters.Args, no
 			}
 		}

-		log.Fatal(gotext.Get("failed to match chosen container"))
+		log.Fatal("failed to match chosen container")
 	}

 	return containers[0], nil
@ -81,6 +79,5 @@ func GetContainerFromStackAndService(cl *client.Client, stack, service string) (
 	if err != nil {
 		return types.Container{}, err
 	}
-
 	return container, nil
 }
--- a/pkg/context/context.go
+++ b/pkg/context/context.go
@ -8,7 +8,6 @@ import (
 	"github.com/docker/cli/cli/context"
 	contextStore "github.com/docker/cli/cli/context/store"
 	cliflags "github.com/docker/cli/cli/flags"
-	"github.com/leonelquinteros/gotext"
 )

 func NewDefaultDockerContextStore() *command.ContextStoreWithDefault {
@ -31,7 +30,7 @@ func NewDefaultDockerContextStore() *command.ContextStoreWithDefault {
 func GetContextEndpoint(ctx contextStore.Metadata) (string, error) {
 	endpointmeta, ok := ctx.Endpoints["docker"].(context.EndpointMetaBase)
 	if !ok {
-		err := errors.New(gotext.Get("context lacks Docker endpoint"))
+		err := errors.New("context lacks Docker endpoint")
 		return "", err
 	}
 	return endpointmeta.Host, nil
--- a/pkg/dns/dns.go
+++ b/pkg/dns/dns.go
@ -1,21 +1,19 @@
 package dns

 import (
-	"errors"
+	"fmt"
 	"net"
-
-	"github.com/leonelquinteros/gotext"
 )

 // EnsureIPv4 ensures that an ipv4 address is set for a domain name
 func EnsureIPv4(domainName string) (string, error) {
 	ipv4, err := net.ResolveIPAddr("ip4", domainName)
 	if err != nil {
-		return "", errors.New(gotext.Get("%s: unable to resolve IPv4 address: %s", domainName, err))
+		return "", fmt.Errorf("%s: unable to resolve IPv4 address: %s", domainName, err)
 	}

 	if ipv4 == nil {
-		return "", errors.New(gotext.Get("%s: no IPv4 available", domainName))
+		return "", fmt.Errorf("%s: no IPv4 available", domainName)
 	}

 	return ipv4.String(), nil
@ -35,7 +33,7 @@ func EnsureDomainsResolveSameIPv4(domainName, server string) (string, error) {
 	}

 	if domainIPv4 == "" {
-		return ipv4, errors.New(gotext.Get("cannot resolve ipv4 for %s?", domainName))
+		return ipv4, fmt.Errorf("cannot resolve ipv4 for %s?", domainName)
 	}

 	serverIPv4, err := EnsureIPv4(server)
@ -44,16 +42,12 @@ func EnsureDomainsResolveSameIPv4(domainName, server string) (string, error) {
 	}

 	if serverIPv4 == "" {
-		return ipv4, errors.New(gotext.Get("cannot resolve ipv4 for %s?", server))
+		return ipv4, fmt.Errorf("cannot resolve ipv4 for %s?", server)
 	}

 	if domainIPv4 != serverIPv4 {
-		return ipv4, errors.New(
-			gotext.Get(
-				"app domain %s (%s) does not appear to resolve to app server %s (%s)?",
-				domainName, domainIPv4, server, serverIPv4,
-			),
-		)
+		err := "app domain %s (%s) does not appear to resolve to app server %s (%s)?"
+		return ipv4, fmt.Errorf(err, domainName, domainIPv4, server, serverIPv4)
 	}

 	return ipv4, nil
--- a/pkg/dns/dns_test.go
+++ b/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 <domain>` to ensure stuff matches first! If flakyness
+		// `dig +short <app>` 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 <domain>` to ensure stuff matches first! If flakyness becomes an
+	// +short <app>` to ensure stuff matches first! If flakyness becomes an
 	// issue we can look into mocking
 	domainName := "collabora.ostrom.collective.tools"
 	serverName := "ostrom.collective.tools"
--- a/pkg/envfile/envfile.go
+++ b/pkg/envfile/envfile.go
@ -2,16 +2,20 @@ package envfile

 import (
 	"bufio"
-	"errors"
+	"fmt"
 	"os"
 	"regexp"
 	"strings"

 	"coopcloud.tech/abra/pkg/log"
-	"git.coopcloud.tech/toolshed/godotenv"
-	"github.com/leonelquinteros/gotext"
+	"git.coopcloud.tech/coop-cloud/godotenv"
 )

+// envVarModifiers is a list of env var modifier strings. These are added to
+// env vars as comments and modify their processing by Abra, e.g. determining
+// how long secrets should be.
+var envVarModifiers = []string{"length"}
+
 // AppEnv is a map of the values in an apps env config
 type AppEnv = map[string]string

@ -27,6 +31,8 @@ func ReadEnv(filePath string) (AppEnv, error) {
 		return nil, err
 	}

+	log.Debugf("read %s from %s", envVars, filePath)
+
 	return envVars, nil
 }

@ -39,7 +45,7 @@ func ReadEnvWithModifiers(filePath string) (AppEnv, AppModifiers, error) {
 		return nil, mods, err
 	}

-	log.Debug(gotext.Get("read %s from %s", envVars, filePath))
+	log.Debugf("read %s from %s", envVars, filePath)

 	return envVars, mods, nil
 }
@ -70,16 +76,16 @@ func ReadAbraShEnvVars(abraSh string) (map[string]string, error) {
 			envVarDef := splitVals[len(splitVals)-1]
 			keyVal := strings.Split(envVarDef, "=")
 			if len(keyVal) != 2 {
-				return envVars, errors.New(gotext.Get("couldn't parse %s", txt))
+				return envVars, fmt.Errorf("couldn't parse %s", txt)
 			}
 			envVars[keyVal[0]] = keyVal[1]
 		}
 	}

 	if len(envVars) > 0 {
-		log.Debug(gotext.Get("read %s from %s", envVars, abraSh))
+		log.Debugf("read %s from %s", envVars, abraSh)
 	} else {
-		log.Debug(gotext.Get("read 0 env var exports from %s", abraSh))
+		log.Debugf("read 0 env var exports from %s", abraSh)
 	}

 	return envVars, nil
--- a/pkg/envfile/envfile_test.go
+++ b/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("SECRET_TEST_PASS_TWO_VERSION env var should be present in .env.sample")
+		t.Fatal("WITH_COMMENT env var should be present in .env.sample")
 	}

 	if strings.Contains(envVar, "length") {
--- a/pkg/formatter/formatter.go
+++ b/pkg/formatter/formatter.go
@ -11,18 +11,13 @@ import (
 	"github.com/charmbracelet/lipgloss"
 	"github.com/charmbracelet/lipgloss/table"
 	"github.com/docker/go-units"
-	"github.com/leonelquinteros/gotext"
 	"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)

@ -43,7 +38,7 @@ func RemoveSha(str string) string {
 func HumanDuration(timestamp int64) string {
 	date := time.Unix(timestamp, 0)
 	now := time.Now().UTC()
-	return units.HumanDuration(now.Sub(date)) + gotext.Get(" ago")
+	return units.HumanDuration(now.Sub(date)) + " ago"
 }

 // CreateTable prepares a table layout for output.
@ -77,7 +72,7 @@ func CreateTable() (*table.Table, error) {
 func PrintTable(t *table.Table) error {
 	if isAbraCI, ok := os.LookupEnv("ABRA_CI"); ok && isAbraCI == "1" {
 		// NOTE(d1): no width limits for CI testing since we test against outputs
-		log.Debug(gotext.Get("detected ABRA_CI=1"))
+		log.Debug("detected ABRA_CI=1")
 		fmt.Println(t)
 		return nil
 	}
@ -107,6 +102,7 @@ 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().
@ -114,7 +110,9 @@ func CreateOverview(header string, rows [][]string) string {
 		Bold(true).
 		PaddingBottom(1)

-	var leftStyle = lipgloss.NewStyle()
+	var leftStyle = lipgloss.NewStyle().
+		Bold(true)
+
 	var rightStyle = lipgloss.NewStyle()

 	var longest int
@ -126,12 +124,8 @@ func CreateOverview(header string, rows [][]string) string {

 	var renderedRows []string
 	for _, row := range rows {
-		if len(row) < 2 {
-			continue
-		}
-
 		if len(row) > 2 {
-			panic(gotext.Get("CreateOverview: only accepts rows of len == 2"))
+			panic("CreateOverview: only accepts rows of len == 2")
 		}

 		lenOffset := 4
@ -144,21 +138,10 @@ func CreateOverview(header string, rows [][]string) string {
 			offset = offset + " "
 		}

-		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)
+		renderedRows = append(
+			renderedRows,
+			horizontal(leftStyle.Render(row[0]), offset, rightStyle.Render(row[1])),
+		)
 	}

 	body := strings.Builder{}
@ -218,6 +201,7 @@ func CreateProgressbar(length int, title string) *progressbar.ProgressBar {
 		progressbar.OptionClearOnFinish(),
 		progressbar.OptionSetPredictTime(false),
 		progressbar.OptionShowCount(),
+		progressbar.OptionFullWidth(),
 		progressbar.OptionSetDescription(title),
 	)
 }
@ -235,7 +219,7 @@ func StripTagMeta(image string) string {
 	}

 	if originalImage != image {
-		log.Debug(gotext.Get("stripped %s to %s for parsing", originalImage, image))
+		log.Debugf("stripped %s to %s for parsing", originalImage, image)
 	}

 	return image
@ -258,18 +242,3 @@ 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)
-}
--- a/pkg/formatter/formatter_test.go
+++ b/pkg/formatter/formatter_test.go
@ -1,11 +0,0 @@
-package formatter
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestBoldDirtyDefault(t *testing.T) {
-	assert.Equal(t, "foo", BoldDirtyDefault("foo"))
-}
--- a/pkg/git/add.go
+++ b/pkg/git/add.go
@ -3,7 +3,6 @@ package git
 import (
 	"coopcloud.tech/abra/pkg/log"
 	"github.com/go-git/go-git/v5"
-	"github.com/leonelquinteros/gotext"
 )

 // Add adds a file to the git index.
@ -19,7 +18,7 @@ func Add(repoPath, path string, dryRun bool) error {
 	}

 	if dryRun {
-		log.Debug(gotext.Get("dry run: adding %s", path))
+		log.Debugf("dry run: adding %s", path)
 	} else {
 		worktree.Add(path)
 	}
--- a/pkg/git/branch.go
+++ b/pkg/git/branch.go
@ -1,13 +1,11 @@
 package git

 import (
-	"errors"
 	"fmt"

 	"coopcloud.tech/abra/pkg/log"
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing"
-	"github.com/leonelquinteros/gotext"
 )

 // Check if a branch exists in a repo. Use this and not repository.Branch(),
@ -65,7 +63,7 @@ func GetDefaultBranch(repo *git.Repository, repoPath string) (plumbing.Reference

 	if !HasBranch(repo, "master") {
 		if !HasBranch(repo, "main") {
-			return "", errors.New(gotext.Get("failed to select default branch in %s", repoPath))
+			return "", fmt.Errorf("failed to select default branch in %s", repoPath)
 		}
 		branch = "main"
 	}
@ -92,11 +90,11 @@ func CheckoutDefaultBranch(repo *git.Repository, repoPath string) (plumbing.Refe
 	}

 	if err := worktree.Checkout(checkOutOpts); err != nil {
-		log.Debug(gotext.Get("failed to check out %s in %s", branch, repoPath))
+		log.Debugf("failed to check out %s in %s", branch, repoPath)
 		return branch, err
 	}

-	log.Debug(gotext.Get("successfully checked out %v in %s", branch, repoPath))
+	log.Debugf("successfully checked out %v in %s", branch, repoPath)

 	return branch, nil
 }
--- a/pkg/git/clone.go
+++ b/pkg/git/clone.go
@ -1,107 +1,49 @@
 package git

 import (
-	"context"
-	"errors"
 	"fmt"
 	"os"
-	"os/signal"
+	"path/filepath"
 	"strings"

 	"coopcloud.tech/abra/pkg/log"
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing"
-	"github.com/leonelquinteros/gotext"
 )

-// 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. This
-// function respects Ctrl+C (SIGINT) calls from the user, cancelling the
-// context and deleting the (typically) half-baked clone of the repository.
-// This avoids broken state for future clone / recipe ops.
+// Clone runs a git clone which accounts for different default branches.
 func Clone(dir, url string) error {
-	ctx := context.Background()
-	ctx, cancelCtx := context.WithCancel(ctx)
+	if _, err := os.Stat(dir); os.IsNotExist(err) {
+		log.Debugf("%s does not exist, attempting to git clone from %s", dir, url)

-	sigIntCh := make(chan os.Signal, 1)
-	signal.Notify(sigIntCh, os.Interrupt)
-	defer func() {
-		signal.Stop(sigIntCh)
-		cancelCtx()
-	}()
+		_, 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)

-	errCh := make(chan error)
-
-	go func() {
-		if _, err := os.Stat(dir); os.IsNotExist(err) {
-			log.Debug(gotext.Get("git clone: %s", url))
-
-			_, err := git.PlainCloneContext(ctx, dir, false, &git.CloneOptions{
+			_, err := git.PlainClone(dir, false, &git.CloneOptions{
 				URL:           url,
 				Tags:          git.AllTags,
 				ReferenceName: plumbing.ReferenceName("refs/heads/main"),
 				SingleBranch:  true,
 			})
-
-			if err != nil && gitCloneIgnoreErr(err) {
-				log.Debug(gotext.Get("git clone: %s cloned successfully", dir))
-				errCh <- nil
-			}
-
-			if err := ctx.Err(); err != nil {
-				errCh <- errors.New(gotext.Get("git clone %s: cancelled due to interrupt", dir))
-			}
-
 			if err != nil {
-				log.Debug(gotext.Get("git clone: main branch failed, attempting master branch"))
-
-				_, err := git.PlainCloneContext(ctx, dir, false, &git.CloneOptions{
-					URL:           url,
-					Tags:          git.AllTags,
-					ReferenceName: plumbing.ReferenceName("refs/heads/master"),
-					SingleBranch:  true,
-				})
-
-				if err != nil && gitCloneIgnoreErr(err) {
-					log.Debug(gotext.Get("git clone: %s cloned successfully", dir))
-					errCh <- 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 {
-					errCh <- err
-				}
+				return err
 			}
-
-			log.Debug(gotext.Get("git clone: %s cloned successfully", dir))
-		} else {
-			log.Debug(gotext.Get("git clone: %s already exists", dir))
 		}

-		errCh <- nil
-	}()
-
-	select {
-	case <-sigIntCh:
-		cancelCtx()
-		fmt.Println() // NOTE(d1): newline after ^C
-		if err := os.RemoveAll(dir); err != nil {
-			return errors.New(gotext.Get("unable to clean up git clone of %s: %s", dir, err))
-		}
-		return errors.New(gotext.Get("git clone %s: cancelled due to interrupt", dir))
-	case err := <-errCh:
-		return err
+		log.Debugf("%s has been git cloned successfully", dir)
+	} else {
+		log.Debugf("%s already exists", dir)
 	}

 	return nil
--- a/pkg/git/clone_test.go
+++ b/pkg/git/clone_test.go
@ -1,48 +0,0 @@
-package git
-
-import (
-	"fmt"
-	"os"
-	"path"
-	"syscall"
-	"testing"
-
-	"coopcloud.tech/abra/pkg/config"
-)
-
-func TestClone(t *testing.T) {
-	dir := path.Join(config.RECIPES_DIR, "gitea")
-	os.RemoveAll(dir)
-
-	gitURL := fmt.Sprintf("%s/%s.git", config.REPOS_BASE_URL, "gitea")
-	if err := Clone(dir, gitURL); err != nil {
-		t.Fatalf("unable to git clone gitea: %s", err)
-	}
-
-	if _, err := os.Stat(dir); err != nil && os.IsNotExist(err) {
-		t.Fatal("gitea repo was not cloned successfully")
-	}
-}
-
-func TestCancelGitClone(t *testing.T) {
-	dir := path.Join(config.RECIPES_DIR, "gitea")
-	os.RemoveAll(dir)
-
-	go func() {
-		p, err := os.FindProcess(os.Getpid())
-		if err != nil {
-			t.Fatalf("unable to find current process: %s", err)
-		}
-
-		p.Signal(syscall.SIGINT)
-	}()
-
-	gitURL := fmt.Sprintf("%s/%s.git", config.REPOS_BASE_URL, "gitea")
-	if err := Clone(dir, gitURL); err == nil {
-		t.Fatal("cloning should have been interrupted")
-	}
-
-	if _, err := os.Stat(dir); err != nil && !os.IsNotExist(err) {
-		t.Fatal("recipe repo was not deleted")
-	}
-}
--- a/pkg/git/commit.go
+++ b/pkg/git/commit.go
@ -1,17 +1,16 @@
 package git

 import (
-	"errors"
+	"fmt"

 	"coopcloud.tech/abra/pkg/log"
 	"github.com/go-git/go-git/v5"
-	"github.com/leonelquinteros/gotext"
 )

 // Commit runs a git commit
 func Commit(repoPath, commitMessage string, dryRun bool) error {
 	if commitMessage == "" {
-		return errors.New(gotext.Get("no commit message specified?"))
+		return fmt.Errorf("no commit message specified?")
 	}

 	commitRepo, err := git.PlainOpen(repoPath)
@ -39,9 +38,45 @@ func Commit(repoPath, commitMessage string, dryRun bool) error {
 		if err != nil {
 			return err
 		}
-		log.Debug(gotext.Get("git changes commited"))
+		log.Debug("git changes commited")
 	} else {
-		log.Debug(gotext.Get("dry run: no changes commited"))
+		log.Debug("dry run: no changes commited")
+	}
+
+	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
--- a/pkg/git/common.go
+++ b/pkg/git/common.go
@ -1,16 +1,14 @@
 package git

 import (
-	"errors"
+	"fmt"
 	"os"
-
-	"github.com/leonelquinteros/gotext"
 )

 // EnsureGitRepo ensures a git repo .git folder exists
 func EnsureGitRepo(repoPath string) error {
 	if _, err := os.Stat(repoPath); os.IsNotExist(err) {
-		return errors.New(gotext.Get("no .git directory in %s?", repoPath))
+		return fmt.Errorf("no .git directory in %s?", repoPath)
 	}
 	return nil
 }
--- a/pkg/git/diff.go
+++ b/pkg/git/diff.go
@ -3,16 +3,16 @@ package git
 import (
 	"fmt"
 	"os/exec"
+	"strings"

 	"coopcloud.tech/abra/pkg/log"
-	"github.com/leonelquinteros/gotext"
 )

 // 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 string) []string {
-	return []string{
+func getGitDiffArgs(repoPath, fname string) []string {
+	args := []string{
 		"-C",
 		repoPath,
 		"--no-pager",
@ -20,24 +20,29 @@ func getGitDiffArgs(repoPath 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. It gracefully
-// skips if it cannot find the command on the system.
-func DiffUnstaged(path string) error {
+// library, this implementation requires the /usr/bin/git binary.
+func DiffUnstaged(path, fname string) (string, error) {
 	if _, err := exec.LookPath("git"); err != nil {
-		log.Warnf(gotext.Get("unable to locate git command, cannot output diff"))
-		return nil
+		return "", fmt.Errorf("missing /usr/bin/git command? cannot output diff")
 	}

-	gitDiffArgs := getGitDiffArgs(path)
+	gitDiffArgs := getGitDiffArgs(path, fname)
+
+	log.Debugf("running: git %s", strings.Join(gitDiffArgs, " "))
+
 	diff, err := exec.Command("git", gitDiffArgs...).Output()
 	if err != nil {
-		return nil
+		return "", err
 	}

-	fmt.Print(string(diff))
-
-	return nil
+	return string(diff), nil
 }
--- a/pkg/git/dir.go
+++ b/pkg/git/dir.go
@ -0,0 +1,35 @@
+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))
+}
--- a/pkg/git/init.go
+++ b/pkg/git/init.go
@ -1,53 +1,48 @@
 package git

 import (
-	"errors"
+	"fmt"

 	"coopcloud.tech/abra/pkg/log"
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/go-git/go-git/v5/plumbing/object"
-	"github.com/leonelquinteros/gotext"
 )

 // Init inits a new repo and commits all the stuff if you want
 func Init(repoPath string, commit bool, gitName, gitEmail string) error {
 	repo, err := git.PlainInit(repoPath, false)
 	if err != nil {
-		return errors.New(gotext.Get("git init: %s", err))
+		return fmt.Errorf("git init: %s", err)
 	}
-
 	if err = SwitchToMain(repo); err != nil {
-		return errors.New(gotext.Get("git branch rename: %s", err))
+		return fmt.Errorf("git branch rename: %s", err)
 	}
-
-	log.Debug(gotext.Get("initialised new git repo in %s", repoPath))
+	log.Debugf("initialised new git repo in %s", repoPath)

 	if commit {
 		commitRepo, err := git.PlainOpen(repoPath)
 		if err != nil {
-			return errors.New(gotext.Get("git open: %s", err))
+			return fmt.Errorf("git open: %s", err)
 		}

 		commitWorktree, err := commitRepo.Worktree()
 		if err != nil {
-			return errors.New(gotext.Get("git worktree: %s", err))
+			return fmt.Errorf("git worktree: %s", err)
 		}

 		if err := commitWorktree.AddWithOptions(&git.AddOptions{All: true}); err != nil {
-			return errors.New(gotext.Get("git add: %s", err))
+			return fmt.Errorf("git add: %s", err)
 		}

 		var author *object.Signature
 		if gitName != "" && gitEmail != "" {
 			author = &object.Signature{Name: gitName, Email: gitEmail}
 		}
-
 		if _, err = commitWorktree.Commit("init", &git.CommitOptions{Author: author}); err != nil {
-			return errors.New(gotext.Get("git commit: %s", err))
+			return fmt.Errorf("git commit: %s", err)
 		}
-
-		log.Debug(gotext.Get("init committed all files for new git repo in %s", repoPath))
+		log.Debugf("init committed all files for new git repo in %s", repoPath)
 	}

 	return nil
@ -57,20 +52,16 @@ func Init(repoPath string, commit bool, gitName, gitEmail string) error {
 func SwitchToMain(repo *git.Repository) error {
 	ref := plumbing.NewSymbolicReference(plumbing.HEAD, plumbing.ReferenceName("refs/heads/main"))
 	if err := repo.Storer.SetReference(ref); err != nil {
-		return errors.New(gotext.Get("set reference: %s", err))
+		return fmt.Errorf("set reference: %s", err)
 	}
-
 	cfg, err := repo.Config()
 	if err != nil {
-		return errors.New(gotext.Get("repo config: %s", err))
+		return fmt.Errorf("repo config: %s", err)
 	}
-
 	cfg.Init.DefaultBranch = "main"
 	if err := repo.SetConfig(cfg); err != nil {
-		return errors.New(gotext.Get("repo set config: %s", err))
+		return fmt.Errorf("repo set config: %s", err)
 	}
-
-	log.Debug(gotext.Get("set 'main' as the default branch"))
-
+	log.Debug("set 'main' as the default branch.")
 	return nil
 }
--- a/pkg/git/pull.go
+++ b/pkg/git/pull.go
@ -0,0 +1,41 @@
+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
+}
--- a/pkg/git/push.go
+++ b/pkg/git/push.go
@ -4,13 +4,12 @@ import (
 	"coopcloud.tech/abra/pkg/log"
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/config"
-	"github.com/leonelquinteros/gotext"
 )

 // Push pushes the latest changes & optionally tags to the default remote
 func Push(repoDir string, remote string, tags bool, dryRun bool) error {
 	if dryRun {
-		log.Debug(gotext.Get("dry run: no git changes pushed in %s", repoDir))
+		log.Debugf("dry run: no git changes pushed in %s", repoDir)
 		return nil
 	}

@ -28,7 +27,7 @@ func Push(repoDir string, remote string, tags bool, dryRun bool) error {
 		return err
 	}

-	log.Debug(gotext.Get("git changes pushed"))
+	log.Debug("git changes pushed")

 	if tags {
 		opts.RefSpecs = append(opts.RefSpecs, config.RefSpec("+refs/tags/*:refs/tags/*"))
@ -37,7 +36,7 @@ func Push(repoDir string, remote string, tags bool, dryRun bool) error {
 			return err
 		}

-		log.Debug(gotext.Get("git tags pushed"))
+		log.Debug("git tags pushed")
 	}

 	return nil
--- a/pkg/git/read.go
+++ b/pkg/git/read.go
@ -1,7 +1,6 @@
 package git

 import (
-	"errors"
 	"io/ioutil"
 	"os"
 	"os/user"
@ -12,23 +11,18 @@ import (
 	"github.com/go-git/go-git/v5"
 	gitConfigPkg "github.com/go-git/go-git/v5/config"
 	"github.com/go-git/go-git/v5/plumbing/format/gitignore"
-	"github.com/leonelquinteros/gotext"
 )

 // IsClean checks if a repo has unstaged changes
 func IsClean(repoPath string) (bool, error) {
 	repo, err := git.PlainOpen(repoPath)
 	if err != nil {
-		if errors.Is(err, git.ErrRepositoryNotExists) {
-			return false, git.ErrRepositoryNotExists
-		}
-
-		return false, errors.New(gotext.Get("unable to open %s: %s", repoPath, err))
+		return false, err
 	}

 	worktree, err := repo.Worktree()
 	if err != nil {
-		return false, errors.New(gotext.Get("unable to open worktree of %s: %s", repoPath, err))
+		return false, err
 	}

 	patterns, err := GetExcludesFiles()
@ -42,14 +36,13 @@ func IsClean(repoPath string) (bool, error) {

 	status, err := worktree.Status()
 	if err != nil {
-		return false, errors.New(gotext.Get("unable to query status of %s: %s", repoPath, err))
+		return false, err
 	}

 	if status.String() != "" {
-		noNewline := strings.TrimSuffix(status.String(), "\n")
-		log.Debug(gotext.Get("git status: %s: %s", repoPath, noNewline))
+		log.Debugf("discovered git status in %s: %s", repoPath, status.String())
 	} else {
-		log.Debug(gotext.Get("git status: %s: clean", repoPath))
+		log.Debugf("discovered clean git status in %s", repoPath)
 	}

 	return status.IsClean(), nil
@ -85,7 +78,7 @@ func parseGitConfig() (*gitConfigPkg.Config, error) {
 	globalGitConfig := filepath.Join(usr.HomeDir, ".gitconfig")
 	if _, err := os.Stat(globalGitConfig); err != nil {
 		if os.IsNotExist(err) {
-			log.Debug(gotext.Get("no %s exists, not reading any global gitignore config", globalGitConfig))
+			log.Debugf("no %s exists, not reading any global gitignore config", globalGitConfig)
 			return cfg, nil
 		}
 		return cfg, err
@ -127,7 +120,7 @@ func parseExcludesFile(excludesfile string) ([]gitignore.Pattern, error) {

 	if _, err := os.Stat(excludesfile); err != nil {
 		if os.IsNotExist(err) {
-			log.Debug(gotext.Get("no %s exists, skipping reading gitignore paths", excludesfile))
+			log.Debugf("no %s exists, skipping reading gitignore paths", excludesfile)
 			return ps, nil
 		}
 		return ps, err
@ -146,7 +139,7 @@ func parseExcludesFile(excludesfile string) ([]gitignore.Pattern, error) {
 		}
 	}

-	log.Debug(gotext.Get("read global ignore paths: %s", strings.Join(pathsRaw, " ")))
+	log.Debugf("read global ignore paths: %s", strings.Join(pathsRaw, " "))

 	return ps, nil
 }
--- a/pkg/git/read_test.go
+++ b/pkg/git/read_test.go
@ -1,15 +0,0 @@
-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))
-}
--- a/pkg/git/remote.go
+++ b/pkg/git/remote.go
@ -6,13 +6,12 @@ import (
 	"coopcloud.tech/abra/pkg/log"
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/config"
-	"github.com/leonelquinteros/gotext"
 )

 // CreateRemote creates a new git remote in a repository
 func CreateRemote(repo *git.Repository, name, url string, dryRun bool) error {
 	if dryRun {
-		log.Debug(gotext.Get("dry run: remote %s (%s) not created", name, url))
+		log.Debugf("dry run: remote %s (%s) not created", name, url)
 		return nil
 	}

--- a/pkg/lang/lang.go
+++ b/pkg/lang/lang.go
@ -1,31 +0,0 @@
-package lang
-
-import (
-	"embed"
-	"fmt"
-	"os"
-
-	"github.com/leonelquinteros/gotext"
-)
-
-//go:embed locales
-var assetFS embed.FS
-
-func GetLocale() string {
-	return os.Getenv("LANG")
-}
-
-func LoadLocale(locale string) error {
-	localePath := fmt.Sprintf("locales/%s/%s.po", locale)
-
-	b, err := assetFS.ReadFile(localePath)
-	if err != nil {
-		return fmt.Errorf("unable to load %s: %s", localePath, err)
-	}
-
-	po := gotext.NewPo()
-	po.Parse(b)
-	gotext.GetStorage().AddTranslator("abra", po)
-
-	return nil
-}
--- a/pkg/lang/locales/abra.pot
+++ b/pkg/lang/locales/abra.pot
@ -1,48 +0,0 @@
-msgid ""
-msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
-"X-Generator: xgotext\n"
-
-#: volumes.go:63
-msgid "%d retries failed"
-msgstr ""
-
-#: volumes.go:59
-msgid "%s: waiting %d seconds before next retry"
-msgstr ""
-
-#: configs.go:35
-msgid "conf %s: %s"
-msgstr ""
-
-#: context.go:66
-msgid "context 'default' cannot be removed"
-msgstr ""
-
-#: client.go:88
-msgid "created client for %s"
-msgstr ""
-
-#: context.go:26
-msgid "created the %s context"
-msgstr ""
-
-#: registry.go:20
-msgid "failed to parse image %s, saw: %s"
-msgstr ""
-
-#: client.go:97
-msgid "swarm mode not enabled on %s?"
-msgstr ""
-
-#: client.go:100
-msgid "swarm mode not enabled on local server?"
-msgstr ""
-
-#: client.go:44
-msgid "unknown server, run 'abra server add %s'?"
-msgstr ""
--- a/pkg/lang/locales/es/LC_MESSAGES/es.po
+++ b/pkg/lang/locales/es/LC_MESSAGES/es.po
@ -1,20 +0,0 @@
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-08-04 14:15+0000\n"
-"PO-Revision-Date: 2025-08-04 14:15+0000\n"
-"Last-Translator: 3wordchant <3wc.coopcloud@doesthisthing.work>\n"
-"Language-Team: Spanish <https://translate.coopcloud.tech/projects/"
-"co-op-cloud/abra/es/>\n"
-"Language: es\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: ENCODING\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.12.2\n"
-
-#: app.go:11
-msgid "Manage apps"
-msgstr "Gestionar aplicaciones"
--- a/pkg/lint/recipe.go
+++ b/pkg/lint/recipe.go
@ -1,7 +1,6 @@
 package lint

 import (
-	"errors"
 	"fmt"
 	"net/http"
 	"os"
@ -14,13 +13,10 @@ import (
 	"github.com/distribution/reference"
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing"
-	"github.com/leonelquinteros/gotext"
 )

-var (
-	Warn     = gotext.Get("warn")
-	Critical = gotext.Get("critical")
-)
+var Warn = "warn"
+var Critical = "critical"

 type LintFunction func(recipe.Recipe) (bool, error)

@ -49,10 +45,10 @@ func (l LintRule) Skip(recipe recipe.Recipe) bool {
 	if l.SkipCondition != nil {
 		ok, err := l.SkipCondition(recipe)
 		if err != nil {
-			log.Debug(gotext.Get("%s: skip condition: %s", l.Ref, err))
+			log.Debugf("%s: skip condition: %s", l.Ref, err)
 		}
 		if ok {
-			log.Debug(gotext.Get("skipping %s based on skip condition", l.Ref))
+			log.Debugf("skipping %s based on skip condition", l.Ref)
 			return true
 		}
 	}
@ -64,117 +60,117 @@ var LintRules = map[string][]LintRule{
 	"warn": {
 		{
 			Ref:          "R001",
-			Level:        gotext.Get("warn"),
-			Description:  gotext.Get("compose config has expected version"),
-			HowToResolve: gotext.Get("ensure 'version: \"3.8\"' in compose configs"),
+			Level:        "warn",
+			Description:  "compose config has expected version",
+			HowToResolve: "ensure 'version: \"3.8\"' in compose configs",
 			Function:     LintComposeVersion,
 		},
 		{
 			Ref:          "R002",
-			Level:        gotext.Get("warn"),
-			Description:  gotext.Get("healthcheck enabled for all services"),
-			HowToResolve: gotext.Get("wire up healthchecks"),
+			Level:        "warn",
+			Description:  "healthcheck enabled for all services",
+			HowToResolve: "wire up healthchecks",
 			Function:     LintHealthchecks,
 		},
 		{
 			Ref:          "R003",
-			Level:        gotext.Get("warn"),
-			Description:  gotext.Get("all images use a tag"),
-			HowToResolve: gotext.Get("use a tag for all images"),
+			Level:        "warn",
+			Description:  "all images use a tag",
+			HowToResolve: "use a tag for all images",
 			Function:     LintAllImagesTagged,
 		},
 		{
 			Ref:          "R004",
-			Level:        gotext.Get("warn"),
-			Description:  gotext.Get("no unstable tags"),
-			HowToResolve: gotext.Get("tag all images with stable tags"),
+			Level:        "warn",
+			Description:  "no unstable tags",
+			HowToResolve: "tag all images with stable tags",
 			Function:     LintNoUnstableTags,
 		},
 		{
 			Ref:          "R005",
-			Level:        gotext.Get("warn"),
-			Description:  gotext.Get("tags use semver-like format"),
-			HowToResolve: gotext.Get("use semver-like tags"),
+			Level:        "warn",
+			Description:  "tags use semver-like format",
+			HowToResolve: "use semver-like tags",
 			Function:     LintSemverLikeTags,
 		},
 		{
 			Ref:          "R006",
-			Level:        gotext.Get("warn"),
-			Description:  gotext.Get("has published catalogue version"),
-			HowToResolve: gotext.Get("publish a recipe version to the catalogue"),
+			Level:        "warn",
+			Description:  "has published catalogue version",
+			HowToResolve: "publish a recipe version to the catalogue",
 			Function:     LintHasPublishedVersion,
 		},
 		{
 			Ref:          "R007",
-			Level:        gotext.Get("warn"),
-			Description:  gotext.Get("README.md metadata filled in"),
-			HowToResolve: gotext.Get("fill out all the metadata"),
+			Level:        "warn",
+			Description:  "README.md metadata filled in",
+			HowToResolve: "fill out all the metadata",
 			Function:     LintMetadataFilledIn,
 		},
 		{
 			Ref:          "R013",
-			Level:        gotext.Get("warn"),
-			Description:  gotext.Get("git.coopcloud.tech repo exists"),
-			HowToResolve: gotext.Get("upload your recipe to git.coopcloud.tech/coop-cloud/..."),
+			Level:        "warn",
+			Description:  "git.coopcloud.tech repo exists",
+			HowToResolve: "upload your recipe to git.coopcloud.tech/coop-cloud/...",
 			Function:     LintHasRecipeRepo,
 		},
 		{
 			Ref:          "R015",
-			Level:        gotext.Get("warn"),
-			Description:  gotext.Get("long secret names"),
-			HowToResolve: gotext.Get("reduce length of secret names to 12 chars"),
+			Level:        "warn",
+			Description:  "long secret names",
+			HowToResolve: "reduce length of secret names to 12 chars",
 			Function:     LintSecretLengths,
 		},
 	},
 	"error": {
 		{
 			Ref:          "R008",
-			Level:        gotext.Get("error"),
-			Description:  gotext.Get(".env.sample provided"),
-			HowToResolve: gotext.Get("create an example .env.sample"),
+			Level:        "error",
+			Description:  ".env.sample provided",
+			HowToResolve: "create an example .env.sample",
 			Function:     LintEnvConfigPresent,
 		},
 		{
 			Ref:          "R009",
-			Level:        gotext.Get("error"),
-			Description:  gotext.Get("one service named 'app'"),
-			HowToResolve: gotext.Get("name a servce 'app'"),
+			Level:        "error",
+			Description:  "one service named 'app'",
+			HowToResolve: "name a servce 'app'",
 			Function:     LintAppService,
 		},
 		{
 			Ref:          "R015",
-			Level:        gotext.Get("error"),
-			Description:  gotext.Get("deploy labels stanza present"),
-			HowToResolve: gotext.Get("include \"deploy: labels: ...\" stanza"),
+			Level:        "error",
+			Description:  "deploy labels stanza present",
+			HowToResolve: "include \"deploy: labels: ...\" stanza",
 			Function:     LintDeployLabelsPresent,
 		},
 		{
 			Ref:           "R010",
-			Level:         gotext.Get("error"),
-			Description:   gotext.Get("traefik routing enabled"),
-			HowToResolve:  gotext.Get("include \"traefik.enable=true\" deploy label"),
+			Level:         "error",
+			Description:   "traefik routing enabled",
+			HowToResolve:  "include \"traefik.enable=true\" deploy label",
 			Function:      LintTraefikEnabled,
 			SkipCondition: LintTraefikEnabledSkipCondition,
 		},
 		{
 			Ref:          "R011",
-			Level:        gotext.Get("error"),
-			Description:  gotext.Get("all services have images"),
-			HowToResolve: gotext.Get("ensure \"image: ...\" set on all services"),
+			Level:        "error",
+			Description:  "all services have images",
+			HowToResolve: "ensure \"image: ...\" set on all services",
 			Function:     LintImagePresent,
 		},
 		{
 			Ref:          "R012",
-			Level:        gotext.Get("error"),
-			Description:  gotext.Get("config version are vendored"),
-			HowToResolve: gotext.Get("vendor config versions in an abra.sh"),
+			Level:        "error",
+			Description:  "config version are vendored",
+			HowToResolve: "vendor config versions in an abra.sh",
 			Function:     LintAbraShVendors,
 		},
 		{
 			Ref:          "R014",
-			Level:        gotext.Get("error"),
-			Description:  gotext.Get("only annotated tags used for recipe version"),
-			HowToResolve: gotext.Get("replace lightweight tag with annotated tag"),
+			Level:        "error",
+			Description:  "only annotated tags used for recipe version",
+			HowToResolve: "replace lightweight tag with annotated tag",
 			Function:     LintValidTags,
 		},
 	},
@ -184,9 +180,7 @@ var LintRules = map[string][]LintRule{
 // used in code paths such as "app deploy" to avoid nasty surprises but not for
 // the typical linting commands, which do handle other levels.
 func LintForErrors(recipe recipe.Recipe) error {
-	log.Debug(gotext.Get("linting for critical errors in %s configs", recipe.Name))
-
-	var errs string
+	log.Debugf("linting for critical errors in %s configs", recipe.Name)

 	for level := range LintRules {
 		if level != "error" {
@ -200,19 +194,15 @@ func LintForErrors(recipe recipe.Recipe) error {

 			ok, err := rule.Function(recipe)
 			if err != nil {
-				errs += gotext.Get("\nlint %s: %s", rule.Ref, err)
+				return err
 			}
 			if !ok {
-				errs += fmt.Sprintf("\n * %s (%s)", rule.Description, rule.Ref)
+				return fmt.Errorf("lint error in %s configs: \"%s\" failed lint checks (%s)", recipe.Name, rule.Description, rule.Ref)
 			}
 		}
 	}

-	if len(errs) > 0 {
-		return errors.New(gotext.Get("recipe '%s' failed lint checks:\n"+errs[1:], recipe.Name))
-	}
-
-	log.Debug(gotext.Get("linting successful, %s is well configured", recipe.Name))
+	log.Debugf("linting successful, %s is well configured", recipe.Name)

 	return nil
 }
@ -258,7 +248,7 @@ func LintAppService(recipe recipe.Recipe) (bool, error) {
 func LintTraefikEnabledSkipCondition(r recipe.Recipe) (bool, error) {
 	sampleEnv, err := r.SampleEnv()
 	if err != nil {
-		return false, errors.New(gotext.Get("unable to discover .env.sample for %s", r.Name))
+		return false, fmt.Errorf("Unable to discover .env.sample for %s", r.Name)
 	}

 	if _, ok := sampleEnv["DOMAIN"]; !ok {
@ -419,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
 	}
@ -478,7 +468,7 @@ func LintSecretLengths(recipe recipe.Recipe) (bool, error) {
 	}
 	for name := range config.Secrets {
 		if len(name) > 12 {
-			return false, errors.New(gotext.Get("secret %s is longer than 12 characters", name))
+			return false, fmt.Errorf("secret %s is longer than 12 characters", name)
 		}
 	}

@ -488,12 +478,12 @@ func LintSecretLengths(recipe recipe.Recipe) (bool, error) {
 func LintValidTags(recipe recipe.Recipe) (bool, error) {
 	repo, err := git.PlainOpen(recipe.Dir)
 	if err != nil {
-		return false, errors.New(gotext.Get("unable to open %s: %s", recipe.Dir, err))
+		return false, fmt.Errorf("unable to open %s: %s", recipe.Dir, err)
 	}

 	iter, err := repo.Tags()
 	if err != nil {
-		log.Fatal(gotext.Get("unable to list local tags for %s", recipe.Name))
+		log.Fatalf("unable to list local tags for %s", recipe.Name)
 	}

 	if err := iter.ForEach(func(ref *plumbing.Reference) error {
@ -501,7 +491,7 @@ func LintValidTags(recipe recipe.Recipe) (bool, error) {
 		if err != nil {
 			switch err {
 			case plumbing.ErrObjectNotFound:
-				return errors.New(gotext.Get("invalid lightweight tag detected"))
+				return fmt.Errorf("invalid lightweight tag detected")
 			default:
 				return err
 			}
--- a/Show More
+++ b/Show More