wip: fix: deploy status

#478

.drone.yml

@@ -3,12 +3,12 @@ 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
     commands:
@@ -60,31 +60,7 @@ steps:
       - make check
       - make test
 
-  - name: on-demand integration test
+  - name: 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
-          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:
@@ -111,8 +87,3 @@ steps:
 volumes:
   - name: deps
     temp: {}
-
-trigger:
-  action:
-    exclude:
-      - synchronized

Dockerfile

@@ -1,5 +1,5 @@
 # Build image
-FROM golang:1.24-alpine AS build
+FROM golang:1.22-alpine AS build
 
 ENV GOPRIVATE=coopcloud.tech
 

Makefile

@@ -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"

cli/app/cmd.go

@@ -183,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)
@@ -238,7 +238,7 @@ func parseCmdArgs(args []string, isLocal bool) (bool, string) {
 var (
 	local      bool
 	remoteUser string
-	disableTTY bool
+	requestTTY bool
 )
 
 func init() {
@@ -259,11 +259,11 @@ func init() {
 	)
 
 	AppCmdCommand.Flags().BoolVarP(
-		&disableTTY,
+		&requestTTY,
 		"tty",
 		"T",
 		false,
-		"disable remote TTY",
+		"request remote TTY",
 	)
 
 	AppCmdCommand.Flags().BoolVarP(

cli/app/cp.go

@@ -18,7 +18,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"
 	dockerClient "github.com/docker/docker/client"
 	"github.com/docker/docker/errdefs"
 	"github.com/docker/docker/pkg/archive"
@@ -33,7 +33,7 @@ var AppCpCommand = &cobra.Command{
   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,
@@ -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,
@@ -162,7 +162,7 @@ func CopyToContainer(cl *dockerClient.Client, containerID, srcPath, dstPath stri
 	}
 
 	log.Debugf("copy %s from local to %s on container", srcPath, dstPath)
-	copyOpts := containertypes.CopyToContainerOptions{AllowOverwriteDirWithFile: false, CopyUIDGID: false}
+	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,

cli/app/deploy.go

@@ -3,7 +3,6 @@ package app
 import (
 	"context"
 	"fmt"
-	"strings"
 
 	"coopcloud.tech/abra/cli/internal"
 	"coopcloud.tech/abra/pkg/app"
@@ -67,6 +66,8 @@ checkout as-is. Recipe commit hashes are also supported as values for
 		var (
 			deployWarnMessages   []string
 			toDeployVersion      string
+			isChaosCommit        bool
+			toDeployChaosVersion = config.CHAOS_DEFAULT
 		)
 
 		app := internal.ValidateApp(args)
@@ -79,6 +80,10 @@ checkout as-is. Recipe commit hashes are also supported as values for
 			log.Fatal(err)
 		}
 
+		if err := lint.LintForErrors(app.Recipe); err != nil {
+			log.Fatal(err)
+		}
+
 		cl, err := client.New(app.Server)
 		if err != nil {
 			log.Fatal(err)
@@ -95,21 +100,29 @@ checkout as-is. Recipe commit hashes are also supported as values for
 			log.Fatalf("%s is already deployed", app.Name)
 		}
 
-		toDeployVersion, err = getDeployVersion(args, deployMeta, app)
+		toDeployVersion, toDeployChaosVersion, err = getDeployVersion(args, deployMeta, app)
 		if err != nil {
-			log.Fatal(fmt.Errorf("get deploy version: %s", err))
+			log.Fatal(err)
 		}
 
 		if !internal.Chaos {
-			_, err = app.Recipe.EnsureVersion(toDeployVersion)
+			isChaosCommit, err = app.Recipe.EnsureVersion(toDeployVersion)
 			if err != nil {
-				log.Fatalf("ensure recipe: %s", err)
+				log.Fatal(err)
-			}
 			}
 
-		if err := lint.LintForErrors(app.Recipe); err != nil {
+			if isChaosCommit {
+				log.Debugf("assuming chaos commit: %s", toDeployVersion)
+
+				internal.Chaos = true
+				toDeployChaosVersion = toDeployVersion
+
+				toDeployVersion, err = app.Recipe.GetVersionLabelLocal()
+				if err != nil {
 					log.Fatal(err)
 				}
+			}
+		}
 
 		if err := validateSecrets(cl, app); err != nil {
 			log.Fatal(err)
@@ -141,14 +154,18 @@ checkout as-is. Recipe commit hashes are also supported as values for
 			log.Fatal(err)
 		}
 
+		toDeployChaosVersionLabel := toDeployChaosVersion
+		if app.Recipe.Dirty {
+			toDeployChaosVersionLabel = formatter.AddDirtyMarker(toDeployChaosVersionLabel)
+		}
+
 		appPkg.ExposeAllEnv(stackName, compose, app.Env)
 		appPkg.SetRecipeLabel(compose, stackName, app.Recipe.Name)
 		appPkg.SetChaosLabel(compose, stackName, internal.Chaos)
 		if internal.Chaos {
-			appPkg.SetChaosVersionLabel(compose, stackName, toDeployVersion)
+			appPkg.SetChaosVersionLabel(compose, stackName, toDeployChaosVersionLabel)
 		}
 		appPkg.SetUpdateLabel(compose, stackName, app.Env)
-		appPkg.SetVersionLabel(compose, stackName, toDeployVersion)
 
 		envVars, err := appPkg.CheckEnv(app)
 		if err != nil {
@@ -180,12 +197,19 @@ checkout as-is. Recipe commit hashes are also supported as values for
 			deployedVersion = deployMeta.Version
 		}
 
+		toWriteVersion := toDeployVersion
+		if internal.Chaos || isChaosCommit {
+			toWriteVersion = toDeployChaosVersion
+		}
+
 		if err := internal.DeployOverview(
 			app,
-			deployedVersion,
-			toDeployVersion,
-			"",
 			deployWarnMessages,
+			deployedVersion,
+			deployMeta.ChaosVersion,
+			toDeployVersion,
+			toDeployChaosVersion,
+			toWriteVersion,
 		); err != nil {
 			log.Fatal(err)
 		}
@@ -197,16 +221,6 @@ checkout as-is. Recipe commit hashes are also supported as values for
 
 		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,
@@ -214,7 +228,6 @@ checkout as-is. Recipe commit hashes are also supported as values for
 			app.Name,
 			app.Server,
 			internal.DontWaitConverge,
-			f,
 		); err != nil {
 			log.Fatal(err)
 		}
@@ -227,28 +240,43 @@ checkout as-is. Recipe commit hashes are also supported as values for
 			}
 		}
 
-		if err := app.WriteRecipeVersion(toDeployVersion, false); err != nil {
+		if err := app.WriteRecipeVersion(toWriteVersion, false); err != nil {
 			log.Fatalf("writing recipe version failed: %s", err)
 		}
 	},
 }
 
-func getLatestVersionOrCommit(app app.App) (string, error) {
+func getChaosVersion(app app.App, toDeployVersion, toDeployChaosVersion *string) error {
+	var err error
+	*toDeployChaosVersion, err = app.Recipe.ChaosVersion()
+	if err != nil {
+		return err
+	}
+
+	*toDeployVersion, err = app.Recipe.GetVersionLabelLocal()
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func getLatestVersionOrCommit(app app.App) (string, string, error) {
 	versions, err := app.Recipe.Tags()
 	if err != nil {
-		return "", err
+		return "", "", err
 	}
 
 	if len(versions) > 0 && !internal.Chaos {
-		return versions[len(versions)-1], nil
+		return versions[len(versions)-1], "", nil
 	}
 
 	head, err := app.Recipe.Head()
 	if err != nil {
-		return "", err
+		return "", "", err
 	}
 
-	return formatter.SmallSHA(head.String()), nil
+	return "", formatter.SmallSHA(head.String()), nil
 }
 
 // validateArgsAndFlags ensures compatible args/flags.
@@ -275,44 +303,48 @@ func validateSecrets(cl *dockerClient.Client, app app.App) error {
 	return nil
 }
 
-func getDeployVersion(cliArgs []string, deployMeta stack.DeployMeta, app app.App) (string, error) {
+func getDeployVersion(cliArgs []string, deployMeta stack.DeployMeta, app app.App) (string, string, error) {
 	// Chaos mode overrides everything
 	if internal.Chaos {
 		v, err := app.Recipe.ChaosVersion()
 		if err != nil {
-			return "", err
+			return "", "", err
 		}
-		log.Debugf("version: taking chaos version: %s", v)
+		cv, err := app.Recipe.GetVersionLabelLocal()
-		return v, nil
+		if err != nil {
+			return "", "", err
+		}
+		log.Debugf("version: taking chaos version: %s, %s", v, cv)
+		return v, cv, nil
 	}
 
 	// Check if the deploy version is set with a cli argument
 	if len(cliArgs) == 2 && cliArgs[1] != "" {
 		log.Debugf("version: taking version from cli arg: %s", cliArgs[1])
-		return cliArgs[1], nil
+		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 "", fmt.Errorf("version: can not redeploy chaos version %s", app.Recipe.EnvVersionRaw)
-		}
 		log.Debugf("version: taking version from .env file: %s", app.Recipe.EnvVersion)
-		return app.Recipe.EnvVersion, nil
+		return app.Recipe.EnvVersion, "", nil
 	}
 
 	// Take deployed version
 	if deployMeta.IsDeployed {
 		log.Debugf("version: taking deployed version: %s", deployMeta.Version)
-		return deployMeta.Version, nil
+		return deployMeta.Version, "", nil
 	}
 
-	v, err := getLatestVersionOrCommit(app)
+	v, vc, err := getLatestVersionOrCommit(app)
-	log.Debugf("version: taking new recipe version: %s", v)
+	log.Debugf("version: taking new recipe versio: %s, %s", v, vc)
 	if err != nil {
-		return "", err
+		log.Fatal(err)
 	}
-	return v, nil
+	if v == "" {
+		return vc, vc, nil
+	}
+	return v, vc, nil
 }
 
 func init() {

cli/app/list.go

@@ -142,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" && chaosVersion == "unknown" {
+					if version != "unknown" {
-						if err := app.Recipe.EnsureExists(); err != nil {
-							log.Fatalf("unable to clone %s: %s", app.Name, err)
-						}
-
 						updates, err := app.Recipe.Tags()
 						if err != nil {
-							log.Fatalf("unable to retrieve tags for %s: %s", app.Name, err)
+							log.Fatal(err)
 						}
 
 						parsedVersion, err := tagcmp.Parse(version)

cli/app/logs.go

@@ -9,7 +9,6 @@ import (
 	"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/spf13/cobra"
 )
@@ -59,27 +58,23 @@ var AppLogsCommand = &cobra.Command{
 			log.Fatalf("%s is not deployed?", app.Name)
 		}
 
-		var serviceNames []string
+		// TODO
-		if len(args) == 2 {
+		// var serviceNames []string
-			serviceNames = []string{args[1]}
+		// if len(args) == 2 {
-		}
+		// 	serviceNames = []string{args[1]}
+		// }
 
-		f, err := app.Filters(true, false, serviceNames...)
+		// b, err := logs.TailLogs(
-		if err != nil {
+		// 	cl,
-			log.Fatal(err)
+		// 	app,
-		}
+		// 	serviceNames,
-
+		// 	stdErr,
-		opts := logs.TailOpts{
+		// 	sinceLogs,
-			AppName:  app.Name,
+		// 	true,
-			Services: serviceNames,
+		// )
-			StdErr:   stdErr,
+		// if err != nil {
-			Since:    sinceLogs,
+		// 	log.Fatal(err)
-			Filters:  f,
+		// }
-		}
-
-		if err := logs.TailLogs(cl, opts); err != nil {
-			log.Fatal(err)
-		}
 	},
 }
 

cli/app/new.go

@@ -109,15 +109,6 @@ var AppNewCommand = &cobra.Command{
 				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())
-				}
 			}
 		}
 
@@ -194,7 +185,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{}
@@ -218,7 +209,16 @@ var AppNewCommand = &cobra.Command{
 			log.Fatal(err)
 		}
 
-		if err := app.WriteRecipeVersion(recipeVersion, false); err != nil {
+		if err := app.Recipe.IsDirty(); err != nil {
+			log.Fatal(err)
+		}
+
+		toWriteVersion := recipeVersion
+		if internal.Chaos || app.Recipe.Dirty {
+			toWriteVersion = chaosVersion
+		}
+
+		if err := app.WriteRecipeVersion(toWriteVersion, false); err != nil {
 			log.Fatalf("writing recipe version failed: %s", err)
 		}
 	},
@@ -302,12 +302,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:",

cli/app/ps.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"sort"
 	"strings"
 
 	"coopcloud.tech/abra/cli/internal"
@@ -92,14 +91,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 +143,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 +170,10 @@ func showPSOutput(app appPkg.App, cl *dockerClient.Client, deployedVersion, chao
 
 	headers := []string{
 		"SERVICE",
-		"STATUS",
 		"IMAGE",
 		"VERSION",
 		"CHAOS",
+		"STATUS",
 	}
 
 	table.

cli/app/restart.go

@@ -12,7 +12,6 @@ import (
 	"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"
 )
 
@@ -95,36 +94,22 @@ 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)
 
+			// TODO
 			if err := upstream.RunServiceScale(context.Background(), cl, stackServiceName, 0); err != nil {
 				log.Fatal(err)
 			}
 
-			f, err := app.Filters(true, false, serviceName)
+			// TODO
-			if err != nil {
+			if err := stack.WaitOnServices(
-				log.Fatal(err)
+				cmd.Context(),
-			}
+				cl,
-
+				// TODO
-			waitOpts := stack.WaitOpts{
+				[]ui.ServiceMeta{{Name: stackServiceName, ID: "???"}},
-				Services:   []ui.ServiceMeta{{Name: stackServiceName, ID: service.ID}},
+				app.Name,
-				AppName:    app.Name,
+				app.Server,
-				ServerName: app.Server,
+			); err != nil {
-				Filters:    f,
-				NoLog:      true,
-				Quiet:      true,
-			}
-
-			if err := stack.WaitOnServices(cmd.Context(), cl, waitOpts); err != nil {
 				log.Fatal(err)
 			}
 
@@ -135,7 +120,14 @@ Pass "--all-services/-a" to restart all services.`,
 				log.Fatal(err)
 			}
 
-			if err := stack.WaitOnServices(cmd.Context(), cl, waitOpts); err != nil {
+			if err := stack.WaitOnServices(
+				cmd.Context(),
+				cl,
+				// TODO
+				[]ui.ServiceMeta{{Name: stackServiceName, ID: "???"}},
+				app.Name,
+				app.Server,
+			); err != nil {
 				log.Fatal(err)
 			}
 

cli/app/rollback.go

@@ -183,34 +183,24 @@ beforehand. See "abra app backup" for more.`,
 		}
 		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,
+			downgradeWarnMessages,
+			"rollback",
 			deployMeta.Version,
+			chaosVersion,
 			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,
@@ -218,7 +208,6 @@ beforehand. See "abra app backup" for more.`,
 			stackName,
 			app.Server,
 			internal.DontWaitConverge,
-			f,
 		); err != nil {
 			log.Fatal(err)
 		}
@@ -267,7 +256,7 @@ func validateDowngradeVersionArg(
 ) 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)
+		return fmt.Errorf("'%s' is not a known version for %s", deployMeta.Version, app.Recipe.Name)
 	}
 
 	parsedSpecificVersion, err := tagcmp.Parse(specificVersion)

cli/app/run.go

@@ -11,7 +11,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"
 	"github.com/spf13/cobra"
 )
@@ -64,7 +64,7 @@ var AppRunCommand = &cobra.Command{
 		}
 
 		userCmd := args[2:]
-		execCreateOpts := containertypes.ExecOptions{
+		execCreateOpts := types.ExecConfig{
 			AttachStderr: true,
 			AttachStdin:  true,
 			AttachStdout: true,

cli/app/undeploy.go

@@ -54,34 +54,25 @@ 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
+		}
+
+		toWriteVersion := deployMeta.Version
+		if deployMeta.IsChaos {
+			toWriteVersion = chaosVersion
+		}
+
+		if err := internal.UndeployOverview(
 			app,
 			deployMeta.Version,
-			config.NO_DOMAIN_DEFAULT,
+			chaosVersion,
-			"",
+			toWriteVersion,
-			nil,
 		); 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},
 			Detach:     false,
@@ -96,9 +87,7 @@ Passing "--prune/-p" does not remove those volumes.`,
 			}
 		}
 
-		log.Info("undeploy succeeded 🟢")
+		if err := app.WriteRecipeVersion(toWriteVersion, false); err != nil {
-
-		if err := app.WriteRecipeVersion(deployMeta.Version, false); err != nil {
 			log.Fatalf("writing recipe version failed: %s", err)
 		}
 	},

cli/app/upgrade.go

@@ -3,7 +3,6 @@ package app
 import (
 	"context"
 	"fmt"
-	"strings"
 
 	"coopcloud.tech/abra/cli/internal"
 	"coopcloud.tech/abra/pkg/app"
@@ -15,7 +14,6 @@ import (
 	"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"
@@ -45,8 +43,7 @@ beforehand. See "abra app backup" for more.`,
 	ValidArgsFunction: func(
 		cmd *cobra.Command,
 		args []string,
-		toComplete string,
+		toComplete string) ([]string, cobra.ShellCompDirective) {
-	) ([]string, cobra.ShellCompDirective) {
 		switch l := len(args); l {
 		case 0:
 			return autocomplete.AppNameComplete()
@@ -71,13 +68,7 @@ beforehand. See "abra app backup" for more.`,
 
 		app := internal.ValidateApp(args)
 
-		if err := app.Recipe.Ensure(recipe.EnsureContext{
+		if err := app.Recipe.Ensure(internal.GetEnsureContext()); err != nil {
-			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)
 		}
 
@@ -150,9 +141,10 @@ beforehand. See "abra app backup" for more.`,
 
 		log.Debugf("choosing %s as version to upgrade", chosenUpgrade)
 
-		// Get the release notes before checking out the new version in the
+		// NOTE(d1): if release notes written after git tag published, read them
-		// recipe. This enables us to get release notes, that were added after
+		// before we check out the tag and then they'll appear to be missing. this
-		// a release.
+		// covers when we obviously will forget to write release notes before
+		// publishing
 		if err := getReleaseNotes(app, versions, chosenUpgrade, deployMeta, &upgradeReleaseNotes); err != nil {
 			log.Fatal(err)
 		}
@@ -214,19 +206,23 @@ beforehand. See "abra app backup" for more.`,
 			return
 		}
 
-		if upgradeReleaseNotes == "" {
+		chaosVersion := config.CHAOS_DEFAULT
-			upgradeWarnMessages = append(
+		if deployMeta.IsChaos {
-				upgradeWarnMessages,
+			chaosVersion = deployMeta.ChaosVersion
-				fmt.Sprintf("no release notes available for %s", chosenUpgrade),
+
-			)
+			if deployMeta.ChaosVersion == "" {
+				chaosVersion = config.UNKNOWN_DEFAULT
+			}
 		}
 
-		if err := internal.DeployOverview(
+		if err := internal.NewVersionOverview(
 			app,
+			upgradeWarnMessages,
+			"upgrade",
 			deployMeta.Version,
+			chaosVersion,
 			chosenUpgrade,
 			upgradeReleaseNotes,
-			upgradeWarnMessages,
 		); err != nil {
 			log.Fatal(err)
 		}
@@ -238,16 +234,6 @@ beforehand. See "abra app backup" for more.`,
 
 		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,
@@ -255,7 +241,6 @@ beforehand. See "abra app backup" for more.`,
 			stackName,
 			app.Server,
 			internal.DontWaitConverge,
-			f,
 		); err != nil {
 			log.Fatal(err)
 		}
@@ -336,11 +321,6 @@ func getReleaseNotes(
 			}
 
 			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)
 			}
 		}
@@ -392,7 +372,7 @@ func validateUpgradeVersionArg(
 
 	parsedDeployedVersion, err := tagcmp.Parse(deployMeta.Version)
 	if err != nil {
-		return fmt.Errorf("'%s' is not a known version", deployMeta.Version)
+		return err
 	}
 
 	if parsedSpecificVersion.IsLessThan(parsedDeployedVersion) &&
@@ -424,7 +404,9 @@ func ensureDeployed(cl *dockerClient.Client, app app.App) (stack.DeployMeta, err
 	return deployMeta, nil
 }
 
-var showReleaseNotes bool
+var (
+	showReleaseNotes bool
+)
 
 func init() {
 	AppUpgradeCommand.Flags().BoolVarP(

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,

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 = requestTTY
-	execCreateOpts.Tty = true
+	if !requestTTY {
-	if disableTTY {
-		execCreateOpts.Tty = false
 		log.Debugf("not requesting a remote TTY")
 	}
 

cli/internal/deploy.go

@@ -10,6 +10,7 @@ import (
 	"coopcloud.tech/abra/pkg/config"
 	"coopcloud.tech/abra/pkg/formatter"
 	"coopcloud.tech/abra/pkg/log"
+	"coopcloud.tech/abra/pkg/recipe"
 	"coopcloud.tech/tagcmp"
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/charmbracelet/lipgloss"
@@ -37,18 +38,15 @@ func horizontal(left, mid, right string) string {
 	return lipgloss.JoinHorizontal(lipgloss.Left, left, mid, right)
 }
 
-func formatComposeFiles(composeFiles string) string {
+// NewVersionOverview shows an upgrade or downgrade overview
-	return strings.ReplaceAll(composeFiles, ":", "\n")
+func NewVersionOverview(
-}
-
-// DeployOverview shows a deployment overview
-func DeployOverview(
 	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)
@@ -64,7 +62,13 @@ func DeployOverview(
 		domain = config.NO_DOMAIN_DEFAULT
 	}
 
-	envVersion := app.Recipe.EnvVersionRaw
+	upperKind := strings.ToUpper(kind)
+
+	envVersion, err := recipe.GetEnvVersionRaw(app.Recipe.Name)
+	if err != nil {
+		return err
+	}
+
 	if envVersion == "" {
 		envVersion = config.NO_VERSION_DEFAULT
 	}
@@ -74,19 +78,33 @@ func DeployOverview(
 		{"RECIPE", app.Recipe.Name},
 		{"SERVER", server},
 		{"CONFIG", deployConfig},
-		{"", ""},
+
-		{"CURRENT DEPLOYMENT", formatter.BoldDirtyDefault(deployedVersion)},
+		{"CURRENT DEPLOYMENT", "---"},
-		{"ENV VERSION", formatter.BoldDirtyDefault(envVersion)},
+		{"VERSION", formatter.BoldDirtyDefault(deployedVersion)},
-		{"NEW DEPLOYMENT", formatter.BoldDirtyDefault(toDeployVersion)},
+		{"CHAOS ", formatter.BoldDirtyDefault(deployedChaosVersion)},
+
+		{upperKind, "---"},
+		{"VERSION", formatter.BoldDirtyDefault(toDeployVersion)},
+
+		{fmt.Sprintf("%s.ENV", strings.ToUpper(app.Domain)), "---"},
+		{"CURRENT VERSION", formatter.BoldDirtyDefault(envVersion)},
+		{"NEW VERSION", formatter.BoldDirtyDefault(toDeployVersion)},
 	}
 
-	deployType := getDeployType(deployedVersion, toDeployVersion)
+	overview := formatter.CreateOverview(
-	overview := formatter.CreateOverview(fmt.Sprintf("%s OVERVIEW", deployType), rows)
+		fmt.Sprintf("%s OVERVIEW", upperKind),
+		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 +128,168 @@ func DeployOverview(
 	return nil
 }
 
-func getDeployType(currentVersion, newVersion string) string {
+func formatComposeFiles(composeFiles string) string {
-	if newVersion == config.NO_DOMAIN_DEFAULT {
+	return strings.ReplaceAll(composeFiles, ":", "\n")
-		return "UNDEPLOY"
 }
-	if strings.Contains(newVersion, "+U") {
+
-		return "CHAOS DEPLOY"
+// DeployOverview shows a deployment overview
+func DeployOverview(
+	app appPkg.App,
+	warnMessages []string,
+	deployedVersion string,
+	deployedChaosVersion string,
+	toDeployVersion,
+	toDeployChaosVersion string,
+	toWriteVersion string,
+) error {
+	deployConfig := "compose.yml"
+	if composeFiles, ok := app.Env["COMPOSE_FILE"]; ok {
+		deployConfig = formatComposeFiles(composeFiles)
 	}
-	if strings.Contains(currentVersion, "+U") {
+
-		return "UNCHAOS DEPLOY"
+	server := app.Server
+	if app.Server == "default" {
+		server = "local"
 	}
-	if currentVersion == newVersion {
+
-		return "REDEPLOY"
+	domain := app.Domain
+	if domain == "" {
+		domain = config.NO_DOMAIN_DEFAULT
 	}
-	if currentVersion == config.NO_VERSION_DEFAULT {
+
-		return "NEW DEPLOY"
+	if app.Recipe.Dirty {
+		toWriteVersion = formatter.AddDirtyMarker(toWriteVersion)
+		toDeployChaosVersion = formatter.AddDirtyMarker(toDeployChaosVersion)
 	}
-	currentParsed, err := tagcmp.Parse(currentVersion)
+
+	recipeName, exists := app.Env["RECIPE"]
+	if !exists {
+		recipeName = app.Env["TYPE"]
+	}
+
+	envVersion, err := recipe.GetEnvVersionRaw(recipeName)
 	if err != nil {
-		return "DEPLOY"
+		return err
 	}
-	newParsed, err := tagcmp.Parse(newVersion)
+
+	if envVersion == "" {
+		envVersion = config.NO_VERSION_DEFAULT
+	}
+
+	rows := [][]string{
+		{"DOMAIN", domain},
+		{"RECIPE", app.Recipe.Name},
+		{"SERVER", server},
+		{"CONFIG", deployConfig},
+
+		{"CURRENT DEPLOYMENT", "---"},
+		{"VERSION", formatter.BoldDirtyDefault(deployedVersion)},
+		{"CHAOS", formatter.BoldDirtyDefault(deployedChaosVersion)},
+
+		{"NEW DEPLOYMENT", "---"},
+		{"VERSION", formatter.BoldDirtyDefault(toDeployVersion)},
+		{"CHAOS", formatter.BoldDirtyDefault(toDeployChaosVersion)},
+
+		{fmt.Sprintf("%s.ENV", strings.ToUpper(app.Name)), "---"},
+		{"CURRENT VERSION", formatter.BoldDirtyDefault(envVersion)},
+		{"NEW VERSION", formatter.BoldDirtyDefault(toWriteVersion)},
+	}
+
+	overview := formatter.CreateOverview("DEPLOY OVERVIEW", rows)
+
+	fmt.Println(overview)
+
+	for _, msg := range warnMessages {
+		log.Warn(msg)
+	}
+
+	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("deployment cancelled")
+	}
+
+	return nil
+}
+
+// UndeployOverview shows an undeployment overview
+func UndeployOverview(
+	app appPkg.App,
+	deployedVersion,
+	deployedChaosVersion,
+	toWriteVersion string,
+) error {
+	deployConfig := "compose.yml"
+	if composeFiles, ok := app.Env["COMPOSE_FILE"]; ok {
+		deployConfig = formatComposeFiles(composeFiles)
+	}
+
+	server := app.Server
+	if app.Server == "default" {
+		server = "local"
+	}
+
+	domain := app.Domain
+	if domain == "" {
+		domain = config.NO_DOMAIN_DEFAULT
+	}
+
+	recipeName, exists := app.Env["RECIPE"]
+	if !exists {
+		recipeName = app.Env["TYPE"]
+	}
+
+	envVersion, err := recipe.GetEnvVersionRaw(recipeName)
 	if err != nil {
-		return "DEPLOY"
+		return err
 	}
-	if currentParsed.IsLessThan(newParsed) {
+
-		return "UPGRADE"
+	if envVersion == "" {
+		envVersion = config.NO_VERSION_DEFAULT
 	}
-	return "DOWNGRADE"
+
+	rows := [][]string{
+		{"DOMAIN", domain},
+		{"RECIPE", app.Recipe.Name},
+		{"SERVER", server},
+		{"CONFIG", deployConfig},
+
+		{"CURRENT DEPLOYMENT", "---"},
+		{"VERSION", formatter.BoldDirtyDefault(deployedVersion)},
+		{"CHAOS", formatter.BoldDirtyDefault(deployedChaosVersion)},
+
+		{fmt.Sprintf("%s.ENV", strings.ToUpper(app.Name)), "---"},
+		{"CURRENT VERSION", formatter.BoldDirtyDefault(envVersion)},
+		{"NEW VERSION", formatter.BoldDirtyDefault(toWriteVersion)},
+	}
+
+	overview := formatter.CreateOverview("UNDEPLOY OVERVIEW", rows)
+
+	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

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,
@@ -49,39 +36,10 @@ var RecipeFetchCommand = &cobra.Command{
 
 		ensureCtx := internal.GetEnsureContext()
 		if recipeName != "" {
-			r := recipe.Get(recipeName)
+			r := internal.ValidateRecipe(args, cmd.Name())
-			if _, err := os.Stat(r.Dir); !os.IsNotExist(err) {
+			if err := r.Ensure(ensureCtx); err != nil {
-				if !force {
+				log.Fatal(err)
-					log.Warnf("%s is already fetched", r.Name)
-					return
 			}
-			}
-
-			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
 		}
 
@@ -103,8 +61,6 @@ var RecipeFetchCommand = &cobra.Command{
 
 var (
 	fetchAllRecipes bool
-	sshRemote       bool
-	force           bool
 )
 
 func init() {
@@ -115,20 +71,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",
-	)
 }

cli/server/add.go

@@ -103,7 +103,8 @@ developer machine. The domain is then set to "default".`,
 
 		if _, err := client.New(name, timeout); err != nil {
 			cleanUp(name)
-			log.Fatalf("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 {

cli/updater/updater.go

@@ -441,16 +441,6 @@ 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,
@@ -458,7 +448,6 @@ func upgrade(cl *dockerclient.Client, stackName, recipeName, upgradeVersion stri
 		stackName,
 		app.Server,
 		true,
-		f,
 	)
 
 	return err

go.mod

@@ -1,6 +1,6 @@
 module coopcloud.tech/abra
 
-go 1.23.0
+go 1.22.7
 
 toolchain go1.23.1
 
@@ -8,22 +8,23 @@ require (
 	coopcloud.tech/tagcmp v0.0.0-20230809071031-eb3e7758d4eb
 	git.coopcloud.tech/toolshed/godotenv v1.5.2-0.20250103171850-4d0ca41daa5c
 	github.com/AlecAivazis/survey/v2 v2.3.7
-	github.com/charmbracelet/bubbletea v1.3.4
+	github.com/charmbracelet/bubbletea v1.2.4
-	github.com/charmbracelet/lipgloss v1.1.0
+	github.com/charmbracelet/lipgloss v1.0.0
-	github.com/charmbracelet/log v0.4.1
+	github.com/charmbracelet/log v0.4.0
 	github.com/distribution/reference v0.6.0
-	github.com/docker/cli v28.0.1+incompatible
+	github.com/docker/cli v27.4.1+incompatible
-	github.com/docker/docker v28.0.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.14.0
+	github.com/go-git/go-git/v5 v5.13.1
-	github.com/google/go-cmp v0.7.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/muesli/reflow v0.3.0
 	github.com/pkg/errors v0.9.1
-	github.com/schollz/progressbar/v3 v3.18.0
+	github.com/schollz/progressbar/v3 v3.17.1
-	golang.org/x/term v0.30.0
+	golang.org/x/term v0.28.0
 	gopkg.in/yaml.v3 v3.0.1
-	gotest.tools/v3 v3.5.2
+	gotest.tools/v3 v3.5.1
 )
 
 require (
@@ -32,19 +33,18 @@ require (
 	github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
 	github.com/BurntSushi/toml v1.4.0 // indirect
 	github.com/Microsoft/go-winio v0.6.2 // indirect
-	github.com/ProtonMail/go-crypto v1.1.6 // 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/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect
+	github.com/charmbracelet/x/ansi v0.6.0 // indirect
-	github.com/charmbracelet/x/ansi v0.8.0 // indirect
+	github.com/charmbracelet/x/exp/golden v0.0.0-20240815200342-61de596daa2b // 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.0 // indirect
+	github.com/cloudflare/circl v1.5.0 // indirect
 	github.com/containerd/log v0.1.0 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
-	github.com/cyphar/filepath-securejoin v0.4.1 // 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 v1.5.1-1.0.20160303222718-d30aec9fd63c // indirect
@@ -57,7 +57,7 @@ require (
 	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.1 // indirect
 	github.com/go-logfmt/logfmt v0.6.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
@@ -65,15 +65,15 @@ require (
 	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.26.3 // 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
@@ -81,6 +81,7 @@ require (
 	github.com/miekg/pkcs11 v1.1.1 // indirect
 	github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/mmcloughlin/avo v0.6.0 // indirect
 	github.com/moby/docker-image-spec v1.3.1 // indirect
 	github.com/moby/sys/mountinfo v0.6.2 // indirect
 	github.com/moby/sys/user v0.3.0 // indirect
@@ -88,48 +89,49 @@ require (
 	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/pelletier/go-toml v1.9.5 // indirect
-	github.com/pjbgf/sha1cd v0.3.2 // indirect
+	github.com/pjbgf/sha1cd v0.3.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/common v0.63.0 // 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/skeema/knownhosts v1.3.0 // indirect
-	github.com/spf13/pflag v1.0.6 // 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.60.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
-	go.opentelemetry.io/otel v1.35.0 // indirect
+	go.opentelemetry.io/otel v1.33.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.35.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.33.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.35.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.35.0 // indirect
+	go.opentelemetry.io/otel/metric v1.33.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.35.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.33.0 // indirect
-	go.opentelemetry.io/otel/sdk/metric v1.35.0 // indirect
+	go.opentelemetry.io/otel/sdk/metric v1.33.0 // indirect
-	go.opentelemetry.io/otel/trace v1.35.0 // indirect
+	go.opentelemetry.io/otel/trace v1.33.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.5.0 // indirect
-	golang.org/x/crypto v0.36.0 // indirect
+	golang.org/x/crypto v0.32.0 // indirect
-	golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect
+	golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect
-	golang.org/x/net v0.37.0 // indirect
+	golang.org/x/mod v0.22.0 // indirect
-	golang.org/x/sync v0.12.0 // indirect
+	golang.org/x/net v0.34.0 // indirect
-	golang.org/x/text v0.23.0 // indirect
+	golang.org/x/sync v0.10.0 // indirect
-	golang.org/x/time v0.11.0 // indirect
+	golang.org/x/text v0.21.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20250313205543-e70fdf4c4cb4 // indirect
+	golang.org/x/time v0.9.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20250313205543-e70fdf4c4cb4 // indirect
+	golang.org/x/tools v0.29.0 // indirect
-	google.golang.org/grpc v1.71.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 // indirect
-	google.golang.org/protobuf v1.36.5 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422 // indirect
+	google.golang.org/grpc v1.69.2 // indirect
+	google.golang.org/protobuf v1.36.2 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
@@ -138,19 +140,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.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/opencontainers/image-spec v1.1.0 // indirect
-	github.com/prometheus/client_golang v1.21.1 // 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.9.1
+	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.31.0
+	golang.org/x/sys v0.29.0
 )

go.sum

@@ -79,8 +79,8 @@ 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.1.6 h1:ZcV+Ropw6Qn0AX9brlQLAUXfqLBc7Bl+f/DmNxpLfdw=
+github.com/ProtonMail/go-crypto v1.1.3 h1:nRBOetoydLeUb4nHajyO2bKqMLfWQ/ZPwkXqXxPxCFk=
-github.com/ProtonMail/go-crypto v1.1.6/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
+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=
@@ -135,20 +135,16 @@ github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghf
 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.4 h1:kCg7B+jSCFPLYRA52SDZjr51kG/fMUEoPoZrkaDHyoI=
+github.com/charmbracelet/bubbletea v1.2.4 h1:KN8aCViA0eps9SCOThb2/XPIlea3ANJLUkv3KnQRNCE=
-github.com/charmbracelet/bubbletea v1.3.4/go.mod h1:dtcUCyCGEX3g9tosuYiut3MXgY/Jsv9nKVdibKKRRXo=
+github.com/charmbracelet/bubbletea v1.2.4/go.mod h1:Qr6fVQw+wX7JkWWkVyXYk/ZUQ92a6XNekLXa3rR18MM=
-github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc h1:4pZI35227imm7yK2bGPcfpFEmuY1gc2YSTShr4iJBfs=
+github.com/charmbracelet/lipgloss v1.0.0 h1:O7VkGDvqEdGi93X+DeqsQ7PKHDgtQfF8j8/O2qFMQNg=
-github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc/go.mod h1:X4/0JoqgTIPSFcRA/P6INZzIuyqdFY5rm8tb41s9okk=
+github.com/charmbracelet/lipgloss v1.0.0/go.mod h1:U5fy9Z+C38obMs+T+tJqst9VGzlOYGj4ri9reL3qUlo=
-github.com/charmbracelet/lipgloss v1.1.0 h1:vYXsiLHVkK7fp74RkV7b2kq9+zDLoEU4MZoFqR/noCY=
+github.com/charmbracelet/log v0.4.0 h1:G9bQAcx8rWA2T3pWvx7YtPTPwgqpk7D68BX21IRW8ZM=
-github.com/charmbracelet/lipgloss v1.1.0/go.mod h1:/6Q8FR2o+kj8rz4Dq0zQc3vYf7X+B0binUUBwA0aL30=
+github.com/charmbracelet/log v0.4.0/go.mod h1:63bXt/djrizTec0l11H20t8FDSvA4CRZJ1KH22MdptM=
-github.com/charmbracelet/log v0.4.1 h1:6AYnoHKADkghm/vt4neaNEXkxcXLSV2g1rdyFDOpTyk=
+github.com/charmbracelet/x/ansi v0.6.0 h1:qOznutrb93gx9oMiGf7caF7bqqubh6YIM0SWKyA08pA=
-github.com/charmbracelet/log v0.4.1/go.mod h1:pXgyTsqsVu4N9hGdHmQ0xEA4RsXof402LX9ZgiITn2I=
+github.com/charmbracelet/x/ansi v0.6.0/go.mod h1:KBUFw1la39nl0dLl10l5ORDAqGXaeurTQmwyyVKse/Q=
-github.com/charmbracelet/x/ansi v0.8.0 h1:9GTq3xq9caJW8ZrBTe0LIe2fvfLR/bYXKTx2llXn7xE=
+github.com/charmbracelet/x/exp/golden v0.0.0-20240815200342-61de596daa2b h1:MnAMdlwSltxJyULnrYbkZpp4k58Co7Tah3ciKhSNo0Q=
-github.com/charmbracelet/x/ansi v0.8.0/go.mod h1:wdYl/ONOLHLIVmQaxbIYEC/cRKOQyjTkowiI4blgS9Q=
+github.com/charmbracelet/x/exp/golden v0.0.0-20240815200342-61de596daa2b/go.mod h1:wDlXFlCrmJ8J+swcL/MnGUuYnqgQdW9rhSD61oNMb6U=
-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/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=
@@ -168,8 +164,8 @@ github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2u
 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.0 h1:cr5JKic4HI+LkINy2lg3W2jF8sHCVTBncJr5gIIq7qk=
+github.com/cloudflare/circl v1.5.0 h1:hxIWksrX6XN5a1L2TI/h53AGPhNHoUBo+TD1ms9+pys=
-github.com/cloudflare/circl v1.6.0/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
+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=
@@ -283,6 +279,7 @@ 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/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/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
@@ -292,8 +289,8 @@ 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.3.6 h1:4d9N5ykBnSp5Xn2JkhocYDkOpURL/18CYMpo6xB9uWM=
-github.com/cyphar/filepath-securejoin v0.4.1/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI=
+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=
@@ -312,19 +309,19 @@ 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.0.1+incompatible h1:g0h5NQNda3/CxIsaZfH4Tyf6vpxFth7PYl3hgCPOKzs=
+github.com/docker/cli v27.4.1+incompatible h1:VzPiUlRJ/xh+otB75gva3r05isHMo5wXDfPRi5/b4hI=
-github.com/docker/cli v28.0.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
+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.0.1+incompatible h1:FCHjSRdXhNRFjlHMTv4jUNlIBbTeRjrWfeFuJp7jpo0=
+github.com/docker/docker v27.4.1+incompatible h1:ZJvcY7gfwHn1JF48PfbyXg7Jyt9ZCWDW+GGXOIxEwp4=
-github.com/docker/docker v28.0.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+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.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo=
-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/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=
@@ -347,8 +344,8 @@ github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:Htrtb
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/dvsekhvalnov/jose2go v0.0.0-20170216131308-f21a8cedbbae/go.mod h1:7BvyPhdbLxMXIYTFPLsyJRFMsKmOZnQmzh6Gb+uquuM=
 github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
-github.com/elazarl/goproxy v1.7.2 h1:Y2o6urb7Eule09PjlhQRGNsqRfPmYI3KKQLFpCAV3+o=
+github.com/elazarl/goproxy v1.2.3 h1:xwIyKHbaP5yfT6O9KIeYJR5549MXRQkoQMRXGztz8YQ=
-github.com/elazarl/goproxy v1.7.2/go.mod h1:82vkLNir0ALaW14Rc399OTTjyNREgmdL2cVoIbS6XaE=
+github.com/elazarl/goproxy v1.2.3/go.mod h1:YfEbZtqP4AetfO6d40vWchF3znWX7C7Vd6ZMfdL8z64=
 github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
 github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
 github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
@@ -385,12 +382,12 @@ github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c=
 github.com/gliderlabs/ssh v0.3.8/go.mod h1:xYoytBv1sV0aL3CavoDuJIQNURXkkfPA/wxQ1pL1fAU=
 github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI=
 github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic=
-github.com/go-git/go-billy/v5 v5.6.2 h1:6Q86EsPXMa7c3YZ3aLAQsMA0VlWmy43r6FHqa/UNbRM=
+github.com/go-git/go-billy/v5 v5.6.1 h1:u+dcrgaguSSkbjzHwelEjc0Yj300NUevrrPphk/SoRA=
-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.1/go.mod h1:0AsLr1z2+Uksi4NlElmMblP5rPcDZNRCD8ujZCRR2BE=
 github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4=
 github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII=
-github.com/go-git/go-git/v5 v5.14.0 h1:/MD3lCrGjCen5WfEAzKg00MJJffKhC8gzS80ycmCi60=
+github.com/go-git/go-git/v5 v5.13.1 h1:DAQ9APonnlvSWpvolXWIuV6Q6zXy2wHbN4cVlNR5Q+M=
-github.com/go-git/go-git/v5 v5.14.0/go.mod h1:Z5Xhoia5PcWA3NF8vRLURn9E5FRhSl7dGj9ItW3Wk5k=
+github.com/go-git/go-git/v5 v5.13.1/go.mod h1:qryJB4cSBoq3FRoBRf5A77joojuBcmPJ0qu3XXXVixc=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
@@ -487,8 +484,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.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
+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=
@@ -529,8 +526,8 @@ github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgf
 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/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 h1:5ZPtiqj0JL5oKWmcsq4VMaAW5ukBEgSGXEN89zeH1Jo=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 h1:VNqngBF40hVlDloBruUehVYC3ArSgIyScOAyMRqBxRg=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3/go.mod h1:ndYquD05frm2vACXE1nsccT4oJzjhw2arTS2cpUD1PI=
+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=
@@ -592,8 +589,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.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
-github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
+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=
@@ -625,15 +622,17 @@ 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.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
-github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
+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.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
 github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
 github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o=
@@ -659,6 +658,8 @@ github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A=
+github.com/mmcloughlin/avo v0.6.0 h1:QH6FU8SKoTLaVs80GA8TJuLNkUYl4VokHKlPhVDg4YY=
+github.com/mmcloughlin/avo v0.6.0/go.mod h1:8CoAGaCSYXtCPR+8y18Y9aB/kxb8JSS6FRI7mSkvD+8=
 github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
 github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
 github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc=
@@ -693,8 +694,10 @@ github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D
 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/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s=
-github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk=
+github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8=
+github.com/muesli/termenv v0.15.2 h1:GohcuySI0QmI3wN8Ok9PtKGkgkFIk7y6Vpb5PvrY+Wo=
+github.com/muesli/termenv v0.15.2/go.mod h1:Epx+iuz8sNs7mNKhxzH4fWXGNpZwUaJKRS1noLXviQ8=
 github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 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=
@@ -731,8 +734,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.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=
-github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M=
+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=
@@ -762,8 +765,8 @@ github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrap
 github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
 github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
-github.com/pjbgf/sha1cd v0.3.2 h1:a9wb0bp1oC2TGwStyn0Umc/IGKQnEgF0vVaZ8QF8eo4=
+github.com/pjbgf/sha1cd v0.3.1 h1:Dh2GYdpJnO84lIw0LJwTFXjcNbasP/bklicSznyAaPI=
-github.com/pjbgf/sha1cd v0.3.2/go.mod h1:zQWigSxVmsHEZow5qaLtPYxpcKMMQpa09ixqBxuCS6A=
+github.com/pjbgf/sha1cd v0.3.1/go.mod h1:Y8t7jSB/dEI/lQE04A1HVKteqjj9bX5O4+Cex0TCu8s=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -779,8 +782,8 @@ 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.21.1 h1:DOvXXTqVzvkIewV/CDPFdejpMCGeMcbGCQ8YOmu+Ibk=
+github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y=
-github.com/prometheus/client_golang v1.21.1/go.mod h1:U9NM32ykUErtVBxdvD3zfi+EuFkkaBvMb09mIfe0Zgg=
+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=
@@ -794,8 +797,8 @@ github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8
 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc=
 github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
-github.com/prometheus/common v0.63.0 h1:YR/EIY1o3mEFP/kZCD7iDMnLPlGyuU2Gb3HIcXnA98k=
+github.com/prometheus/common v0.61.0 h1:3gv/GThfX0cV2lpO7gkTUwZru38mxevy90Bj8YFSRQQ=
-github.com/prometheus/common v0.63.0/go.mod h1:VVFF/fBIoToEnWRVkYoXEkq3R3paCoxG9PXP74SnV18=
+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=
@@ -810,21 +813,22 @@ github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1
 github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
 github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
+github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
 github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 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.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
-github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
+github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
 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.17.1 h1:bI1MTaoQO+v5kzklBjYNRQLoVpe0zbyRZNK6DFkVC5U=
-github.com/schollz/progressbar/v3 v3.18.0/go.mod h1:IsO3lpbaGuzh8zIMzgY3+J8l4C8GjO0Y9S69eFvNsec=
+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=
@@ -841,8 +845,8 @@ 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.0 h1:AM+y0rI04VksttfwjkSTNQorvGqmwATnvnAHpSgc0LY=
-github.com/skeema/knownhosts v1.3.1/go.mod h1:r7KTdC8l4uxWRyK2TpQZ/1o5HaSzh06ePQNxPwTcfiY=
+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=
@@ -857,8 +861,8 @@ github.com/spf13/cobra v0.0.1/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3
 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.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
-github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
+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=
@@ -867,9 +871,8 @@ github.com/spf13/pflag v1.0.0/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn
 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 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
-github.com/spf13/pflag v1.0.6/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=
@@ -924,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=
@@ -946,26 +947,26 @@ 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.60.0 h1:sbiXRNDSWJOTobXh5HyQKjq6wUC5tNybqjIqDpAY4CU=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 h1:yd02MEjBdJkG3uabWP9apV+OuWRIXGDuJEUJbOHmCFU=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0/go.mod h1:69uWxva0WgAA/4bu2Yy70SLDBwZXuQ6PbBpbsa5iZrQ=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0/go.mod h1:umTcuxiv1n/s/S6/c2AT/g2CQ7u5C59sHDNmfSwgz7Q=
-go.opentelemetry.io/otel v1.35.0 h1:xKWKPxrxB6OtMCbmMY021CqC45J+3Onta9MqjhnusiQ=
+go.opentelemetry.io/otel v1.33.0 h1:/FerN9bax5LoK51X/sI0SVYrjSE0/yUL7DpxW4K3FWw=
-go.opentelemetry.io/otel v1.35.0/go.mod h1:UEqy8Zp11hpkUrL73gSlELM0DupHoiq72dR+Zqel/+Y=
+go.opentelemetry.io/otel v1.33.0/go.mod h1:SUUkR6csvUQl+yjReHu5uM3EtVV7MBm5FHKRlNx4I8I=
-go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.35.0 h1:QcFwRrZLc82r8wODjvyCbP7Ifp3UANaBSmhDSFjnqSc=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.33.0 h1:7F29RDmnlqk6B5d+sUqemt8TBfDqxryYW5gX6L74RFA=
-go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.35.0/go.mod h1:CXIWhUomyWBG/oY2/r/kLp6K/cmx9e/7DLpBuuGdLCA=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.33.0/go.mod h1:ZiGDq7xwDMKmWDrN1XsXAj0iC7hns+2DhxBFSncNHSE=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0 h1:1fTNlAIJZGWLP5FVu0fikVry1IsiUnXjf7QFvoNN3Xw=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 h1:Vh5HayB/0HHfOQA7Ctx69E/Y/DcQSMPpKANYVMQ7fBA=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0/go.mod h1:zjPK58DtkqQFn+YUMbx0M2XV3QgKU0gS9LeGohREyK4=
+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.35.0 h1:m639+BofXTvcY1q8CGs4ItwQarYtJPOWmVobfM1HpVI=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 h1:5pojmb1U1AogINhN3SurB+zm/nIcusopeBNp42f45QM=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.35.0/go.mod h1:LjReUci/F4BUyv+y4dwnq3h/26iNOeC3wAIqgvTIZVo=
+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.35.0 h1:0znxYu2SNyuMSQT4Y9WDWej0VpcsxkuklLa4/siN90M=
+go.opentelemetry.io/otel/metric v1.33.0 h1:r+JOocAyeRVXD8lZpjdQjzMadVZp2M4WmQ+5WtEnklQ=
-go.opentelemetry.io/otel/metric v1.35.0/go.mod h1:nKVFgxBZ2fReX6IlyW28MgZojkoAkJGaE8CpgeAU3oE=
+go.opentelemetry.io/otel/metric v1.33.0/go.mod h1:L9+Fyctbp6HFTddIxClbQkjtubW6O9QS3Ann/M82u6M=
-go.opentelemetry.io/otel/sdk v1.35.0 h1:iPctf8iprVySXSKJffSS79eOjl9pvxV9ZqOWT0QejKY=
+go.opentelemetry.io/otel/sdk v1.33.0 h1:iax7M131HuAm9QkZotNHEfstof92xM+N8sr3uHXc2IM=
-go.opentelemetry.io/otel/sdk v1.35.0/go.mod h1:+ga1bZliga3DxJ3CQGg3updiaAJoNECOgJREo9KHGQg=
+go.opentelemetry.io/otel/sdk v1.33.0/go.mod h1:A1Q5oi7/9XaMlIWzPSxLRWOI8nG3FnzHJNbiENQuihM=
-go.opentelemetry.io/otel/sdk/metric v1.35.0 h1:1RriWBmCKgkeHEhM7a2uMjMUfP7MsOF5JpUCaEqEI9o=
+go.opentelemetry.io/otel/sdk/metric v1.33.0 h1:Gs5VK9/WUJhNXZgn8MR6ITatvAmKeIuCtNbsP3JkNqU=
-go.opentelemetry.io/otel/sdk/metric v1.35.0/go.mod h1:is6XYCUMpcKi+ZsOvfluY5YstFnhW0BidkR+gL+qN+w=
+go.opentelemetry.io/otel/sdk/metric v1.33.0/go.mod h1:dL5ykHZmm1B1nVRk9dDjChwDmt81MjVp3gLkQRwKf/Q=
-go.opentelemetry.io/otel/trace v1.35.0 h1:dPpEfJu1sDIqruz7BHFG3c7528f6ddfSWfFDVt/xgMs=
+go.opentelemetry.io/otel/trace v1.33.0 h1:cCJuF7LRjUFso9LPnEAHJDB2pqzp+hbO8eu1qqW2d/s=
-go.opentelemetry.io/otel/trace v1.35.0/go.mod h1:WUk7DtFp1Aw2MkvqGdwiXYDZZNvA/1J8o6xRXLrIkyc=
+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.5.0 h1:xJvq7gMzB31/d406fB8U5CBdyQGw4P399D1aQWU/3i4=
 go.opentelemetry.io/proto/otlp v1.5.0/go.mod h1:keN8WnHxOy8PG0rQZjJJ5A2ebUoafqWp0eVQ4yIXvJ4=
@@ -993,8 +994,8 @@ golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9/go.mod h1:jdWPYTVW3xRLrWP
 golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
+golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
-golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
+golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -1005,8 +1006,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 h1:nDVHiLt8aIbd/VzvPWN6kSOPE7+F/fNFDSXLVYkE/Iw=
+golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 h1:yqrTHse8TCMW1M1ZCP+VAR/l0kKxwaAIqN/il7x4voA=
-golang.org/x/exp v0.0.0-20250305212735-054e65f0b394/go.mod h1:sIifuuw/Yco/y6yb6+bDNfyeQ/MdPUy/hKEMYQV17cM=
+golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8/go.mod h1:tujkw807nyEEAamNbDrEGzRav+ilXA7PCRAd6xsmwiU=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -1029,6 +1030,8 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
+golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -1070,8 +1073,8 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b
 golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c=
+golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
-golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
+golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -1089,8 +1092,8 @@ 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.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
+golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
-golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+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=
@@ -1168,15 +1171,16 @@ 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.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
+golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
-golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y=
+golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
-golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g=
+golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -1186,16 +1190,16 @@ 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.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
+golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
-golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
+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.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
+golang.org/x/time v0.9.0 h1:EsRrnYcQiGH+5FfbgvV4AP7qEZstoyrHB0DzarOQ4ZY=
-golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
+golang.org/x/time v0.9.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -1241,6 +1245,8 @@ golang.org/x/tools v0.0.0-20200916195026-c9a70fc28ce3/go.mod h1:z6u4i615ZeAfBE4X
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.29.0 h1:Xx0h3TtM9rzQpQuR4dKLrdglAmCEN5Oi+P74JdhdzXE=
+golang.org/x/tools v0.29.0/go.mod h1:KMQVMRsVxU6nHCFXrBPhDB8XncLNLM0lIy/F14RP588=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -1289,10 +1295,10 @@ google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfG
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
 google.golang.org/genproto v0.0.0-20200527145253-8367513e4ece/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
 google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto/googleapis/api v0.0.0-20250313205543-e70fdf4c4cb4 h1:IFnXJq3UPB3oBREOodn1v1aGQeZYQclEmvWRMN0PSsY=
+google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 h1:GVIKPyP/kLIyVOgOnTwFOrvQaQUzOzGMCxgFUOEmm24=
-google.golang.org/genproto/googleapis/api v0.0.0-20250313205543-e70fdf4c4cb4/go.mod h1:c8q6Z6OCqnfVIqUFJkCzKcrj8eCvUrz+K4KRzSTuANg=
+google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422/go.mod h1:b6h1vNKhxaSoEI+5jc3PJUCustfli/mRab7295pY7rw=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250313205543-e70fdf4c4cb4 h1:iK2jbkWL86DXjEx0qiHcRE9dE4/Ahua5k6V8OWFb//c=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422 h1:3UsHvIr4Wc2aW4brOaSCmcxh9ksica6fHEr8P1XhkYw=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250313205543-e70fdf4c4cb4/go.mod h1:LuRYeWDFV6WOn90g357N17oMCaxpgCnbi/44qJvDn2I=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422/go.mod h1:3ENsm/5D1mzDyhpzeRi1NR784I0BcofWBoSc5QqqMK4=
 google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.0.5/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
@@ -1312,8 +1318,8 @@ 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.71.0 h1:kF77BGdPTQ4/JZWMlb9VpJ5pa25aqvVqogsxNHHdeBg=
+google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU=
-google.golang.org/grpc v1.71.0/go.mod h1:H0GRtasmQOh9LkFoCPDu3ZrwUtD1YGE+b2vYBYd/8Ec=
+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=
@@ -1327,8 +1333,8 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
+google.golang.org/protobuf v1.36.2 h1:R8FeyR1/eLmkutZOM5CWghmo5itiG9z0ktFlTVLuTmU=
-google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.36.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/cenkalti/backoff.v2 v2.2.1 h1:eJ9UAg01/HIHG987TwxvnzK2MgxXq97YY6rYDpY9aII=
@@ -1371,8 +1377,8 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 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.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU=
-gotest.tools/v3 v3.5.2/go.mod h1:LtdLGcnqToBH83WByAAi/wiwSFCArdFIUV/xxN4pcjA=
+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=

pkg/app/app.go

@@ -655,6 +655,19 @@ func (a App) WriteRecipeVersion(version string, dryRun bool) error {
 
 		splitted := strings.Split(line, ":")
 
+		if a.Recipe.Dirty {
+			dirtyVersion = fmt.Sprintf("%s%s", version, config.DIRTY_DEFAULT)
+			if strings.Contains(line, dirtyVersion) {
+				skipped = true
+				lines = append(lines, line)
+				continue
+			}
+
+			line = fmt.Sprintf("%s:%s", splitted[0], dirtyVersion)
+			lines = append(lines, line)
+			continue
+		}
+
 		line = fmt.Sprintf("%s:%s", splitted[0], version)
 		lines = append(lines, line)
 	}

pkg/app/app_test.go

@@ -223,4 +223,16 @@ func TestWriteRecipeVersionOverwrite(t *testing.T) {
 	}
 
 	assert.Equal(t, "foo", app.Recipe.EnvVersion)
+
+	app.Recipe.Dirty = true
+	if err := app.WriteRecipeVersion("foo+U", false); err != nil {
+		t.Fatal(err)
+	}
+
+	app, err = appPkg.GetApp(testPkg.ExpectedAppFiles, testPkg.AppName)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	assert.Equal(t, "foo+U", app.Recipe.EnvVersion)
 }

pkg/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.

pkg/git/clone.go

@@ -1,10 +1,7 @@
 package git
 
 import (
-	"context"
-	"fmt"
 	"os"
-	"os/signal"
 	"strings"
 
 	"coopcloud.tech/abra/pkg/log"
@@ -25,28 +22,12 @@ func gitCloneIgnoreErr(err error) bool {
 	return false
 }
 
-// Clone runs a git clone which accounts for different default branches. This
+// Clone runs a git clone which accounts for different default branches.
-// 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.
 func Clone(dir, url string) error {
-	ctx := context.Background()
-	ctx, cancelCtx := context.WithCancel(ctx)
-
-	sigIntCh := make(chan os.Signal, 1)
-	signal.Notify(sigIntCh, os.Interrupt)
-	defer func() {
-		signal.Stop(sigIntCh)
-		cancelCtx()
-	}()
-
-	errCh := make(chan error)
-
-	go func() {
 	if _, err := os.Stat(dir); os.IsNotExist(err) {
-			log.Debugf("git clone: %s", url)
+		log.Debugf("git clone: %s", dir, 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"),
@@ -55,17 +36,13 @@ func Clone(dir, url string) error {
 
 		if err != nil && gitCloneIgnoreErr(err) {
 			log.Debugf("git clone: %s cloned successfully", dir)
-				errCh <- nil
+			return nil
-			}
-
-			if err := ctx.Err(); err != nil {
-				errCh <- fmt.Errorf("git clone %s: cancelled due to interrupt", dir)
 		}
 
 		if err != nil {
 			log.Debug("git clone: main branch failed, attempting master branch")
 
-				_, 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/master"),
@@ -74,11 +51,11 @@ func Clone(dir, url string) error {
 
 			if err != nil && gitCloneIgnoreErr(err) {
 				log.Debugf("git clone: %s cloned successfully", dir)
-					errCh <- nil
+				return nil
 			}
 
 			if err != nil {
-					errCh <- err
+				return err
 			}
 		}
 
@@ -87,20 +64,5 @@ func Clone(dir, url string) error {
 		log.Debugf("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 fmt.Errorf("unable to clean up git clone of %s: %s", dir, err)
-		}
-		return fmt.Errorf("git clone %s: cancelled due to interrupt", dir)
-	case err := <-errCh:
-		return err
-	}
-
 	return nil
 }

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

pkg/lint/recipe.go

@@ -15,10 +15,8 @@ import (
 	"github.com/go-git/go-git/v5/plumbing"
 )
 
-var (
+var Warn = "warn"
-	Warn     = "warn"
+var Critical = "critical"
-	Critical = "critical"
-)
 
 type LintFunction func(recipe.Recipe) (bool, error)
 
@@ -196,7 +194,7 @@ func LintForErrors(recipe recipe.Recipe) error {
 
 			ok, err := rule.Function(recipe)
 			if err != nil {
-				return fmt.Errorf("lint %s: %s", rule.Ref, err)
+				return err
 			}
 			if !ok {
 				return fmt.Errorf("lint error in %s configs: \"%s\" failed lint checks (%s)", recipe.Name, rule.Description, rule.Ref)

pkg/log/log.go

@@ -2,10 +2,8 @@
 package log
 
 import (
-	"math"
 	"os"
 
-	tea "github.com/charmbracelet/bubbletea"
 	charmLog "github.com/charmbracelet/log"
 )
 
@@ -34,13 +32,3 @@ var SetLevel = Logger.SetLevel
 var DebugLevel = charmLog.DebugLevel
 var SetOutput = charmLog.SetOutput
 var SetReportCaller = charmLog.SetReportCaller
-
-type f func() (tea.Model, error)
-
-func Without(fn f) (tea.Model, error) {
-	l := Logger.GetLevel()
-	Logger.SetLevel(math.MaxInt)
-	m, err := fn()
-	Logger.SetLevel(l)
-	return m, err
-}

pkg/logs/logs.go

@@ -1,17 +1,18 @@
 package logs
 
 import (
-	"bufio"
+	"bytes"
 	"context"
-	"fmt"
 	"io"
 	"os"
 	"os/signal"
+	"slices"
 	"sync"
 
 	"github.com/docker/docker/api/types"
 	containerTypes "github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/filters"
+	"github.com/docker/docker/api/types/swarm"
 	dockerClient "github.com/docker/docker/client"
 )
 
@@ -20,7 +21,7 @@ type TailOpts struct {
 	Services []string
 	StdErr   bool
 	Since    string
-	Buffer   *[]string
+	Buffer   *bytes.Buffer
 	ToBuffer bool
 	Filters  filters.Args
 }
@@ -31,32 +32,56 @@ func TailLogs(
 	cl *dockerClient.Client,
 	opts TailOpts,
 ) error {
-	sigIntCh := make(chan os.Signal, 1)
+	sigintChannel := make(chan os.Signal, 1)
-	signal.Notify(sigIntCh, os.Interrupt)
+	signal.Notify(sigintChannel, os.Interrupt)
-	defer signal.Stop(sigIntCh)
+	defer signal.Stop(sigintChannel)
+
+	f := filters.NewArgs()
+	for _, name := range opts.Services {
+		f.Add("name", name)
+	}
 
 	services, err := cl.ServiceList(
 		context.Background(),
-		types.ServiceListOptions{Filters: opts.Filters},
+		types.ServiceListOptions{Filters: f},
 	)
 	if err != nil {
 		return err
 	}
 
-	errCh := make(chan error)
 	waitCh := make(chan struct{})
 
 	go func() {
 		var wg sync.WaitGroup
 		for _, service := range services {
-			wg.Add(1)
+			f := filters.NewArgs()
-			go func(serviceID string) {
+			f.Add("name", service.Spec.Name)
-				tail := "50"
+
-				if opts.ToBuffer {
+			tasks, err := cl.TaskList(context.Background(), types.TaskListOptions{Filters: f})
-					// NOTE(d1): more logs from before deployment when analysing via file
+			if err != nil {
-					tail = "150"
+				// TODO
+				// return nil
 			}
 
+			if len(tasks) > 0 {
+				// Need to sort the tasks by the CreatedAt field in the inverse order.
+				// Otherwise they are in the reversed order and not sorted properly.
+				slices.SortFunc[[]swarm.Task](tasks, func(t1, t2 swarm.Task) int {
+					return int(t2.Meta.CreatedAt.Unix() - t1.Meta.CreatedAt.Unix())
+				})
+				lastTask := tasks[0].Status
+				if lastTask.State != swarm.TaskStateRunning {
+					// for _, task := range tasks {
+					// TODO
+					// return fmt.Errorf("[%s] %s state %s: %s", service.Spec.Name, task.Meta.CreatedAt.Format(time.RFC3339), task.Status.State, task.Status.Err)
+					// }
+				}
+			}
+
+			// Collect the logs in a go routine, so the logs from all services are
+			// collected in parallel.
+			wg.Add(1)
+			go func(serviceID string) {
 				logs, err := cl.ServiceLogs(context.Background(), serviceID, containerTypes.LogsOptions{
 					ShowStderr: true,
 					ShowStdout: !opts.StdErr,
@@ -64,26 +89,32 @@ func TailLogs(
 					Until:      "",
 					Timestamps: true,
 					Follow:     true,
-					Tail:       tail,
+					Tail:       "50",  // TODO: if buf, bump it up!
-					Details:    false,
+					Details:    false, // TODO: if buf, yes!
 				})
-
+				if err != nil {
-				if err == nil {
+					// TODO
+					// log.Debugf("unable to poll logs: %s", err)
+				}
 				defer logs.Close()
+
 				if opts.ToBuffer {
-						buf := bufio.NewScanner(logs)
+					_, err = io.Copy(opts.Buffer, logs)
-						for buf.Scan() {
+					if err != nil && err != io.EOF {
-							line := fmt.Sprintf("%s: %s", service.Spec.Name, buf.Text())
+						// TODO
-							*opts.Buffer = append(*opts.Buffer, line)
+						// log.Debugf("unable to copy buffer: %s", err)
 					}
 					logs.Close()
 					return
 				}
 
-					if _, err = io.Copy(os.Stdout, logs); err != nil && err != io.EOF {
+				_, err = io.Copy(os.Stdout, logs)
-						errCh <- fmt.Errorf("tailLogs: unable to copy buffer: %s", err)
+				if err != nil && err != io.EOF {
-					}
+					// TODO
+					// log.Debugf("unable to copy buffer: %s", err)
 				}
+				logs.Close()
+
 			}(service.ID)
 		}
 
@@ -94,10 +125,8 @@ func TailLogs(
 	select {
 	case <-waitCh:
 		return nil
-	case <-sigIntCh:
+	case <-sigintChannel:
 		return nil
-	case err := <-errCh:
-		return err
 	}
 
 	return nil

pkg/recipe/git.go

@@ -7,7 +7,6 @@ import (
 	"sort"
 	"strings"
 
-	"coopcloud.tech/abra/pkg/config"
 	"coopcloud.tech/abra/pkg/formatter"
 	gitPkg "coopcloud.tech/abra/pkg/git"
 	"coopcloud.tech/abra/pkg/log"
@@ -46,9 +45,6 @@ func (r Recipe) Ensure(ctx EnsureContext) error {
 
 	if r.EnvVersion != "" && !ctx.IgnoreEnvVersion {
 		log.Debugf("ensuring env version %s", r.EnvVersion)
-		if strings.Contains(r.EnvVersion, "+U") {
-			log.Fatalf("can not redeploy chaos version (%s) without --chaos", r.EnvVersion)
-		}
 
 		if _, err := r.EnsureVersion(r.EnvVersion); err != nil {
 			return err
@@ -278,14 +274,19 @@ func (r Recipe) EnsureUpToDate() error {
 	return nil
 }
 
-// IsDirty checks whether a recipe is dirty or not.
+// IsDirty checks whether a recipe is dirty or not. N.B., if you call IsDirty
-func (r *Recipe) IsDirty() (bool, error) {
+// from another Recipe method, you should propagate the pointer reference (*).
+func (r *Recipe) IsDirty() error {
 	isClean, err := gitPkg.IsClean(r.Dir)
 	if err != nil {
-		return false, err
+		return err
 	}
 
-	return !isClean, nil
+	if !isClean {
+		r.Dirty = true
+	}
+
+	return nil
 }
 
 // ChaosVersion constructs a chaos mode recipe version.
@@ -299,12 +300,8 @@ func (r *Recipe) ChaosVersion() (string, error) {
 
 	version = formatter.SmallSHA(head.String())
 
-	dirty, err := r.IsDirty()
+	if err := r.IsDirty(); err != nil {
-	if err != nil {
+		return version, err
-		return "", err
-	}
-	if dirty {
-		return fmt.Sprintf("%s%s", version, config.DIRTY_DEFAULT), nil
 	}
 
 	return version, nil

pkg/recipe/git_test.go

@@ -15,6 +15,10 @@ func TestIsDirty(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	if err := r.IsDirty(); err != nil {
+		t.Fatal(err)
+	}
+
 	assert.False(t, r.Dirty)
 
 	fpath := filepath.Join(r.Dir, "foo.txt")
@@ -27,10 +31,9 @@ func TestIsDirty(t *testing.T) {
 		os.Remove(fpath)
 	})
 
-	dirty, err := r.IsDirty()
+	if err := r.IsDirty(); err != nil {
-	if err != nil {
 		t.Fatal(err)
 	}
 
-	assert.True(t, dirty)
+	assert.True(t, r.Dirty)
 }

pkg/recipe/recipe.go

@@ -12,8 +12,6 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/go-git/go-git/v5"
-
 	"coopcloud.tech/abra/pkg/catalogue"
 	"coopcloud.tech/abra/pkg/config"
 	"coopcloud.tech/abra/pkg/formatter"
@@ -22,6 +20,7 @@ import (
 	"coopcloud.tech/abra/pkg/log"
 	"coopcloud.tech/abra/pkg/web"
 	"coopcloud.tech/tagcmp"
+	"github.com/go-git/go-git/v5"
 )
 
 // RecipeCatalogueURL is the only current recipe catalogue available.
@@ -120,9 +119,22 @@ type Features struct {
 	SSO         string `json:"sso"`
 }
 
+func GetEnvVersionRaw(name string) (string, error) {
+	var version string
+
+	if strings.Contains(name, ":") {
+		split := strings.Split(name, ":")
+		if len(split) > 2 {
+			return version, fmt.Errorf("version seems invalid: %s", name)
+		}
+		version = split[1]
+	}
+
+	return version, nil
+}
+
 func Get(name string) Recipe {
 	version := ""
-	versionRaw := ""
 	if strings.Contains(name, ":") {
 		split := strings.Split(name, ":")
 		if len(split) > 2 {
@@ -131,7 +143,6 @@ func Get(name string) Recipe {
 		name = split[0]
 
 		version = split[1]
-		versionRaw = version
 		if strings.HasSuffix(version, config.DIRTY_DEFAULT) {
 			version = strings.Replace(split[1], config.DIRTY_DEFAULT, "", 1)
 			log.Debugf("removed dirty suffix from .env version: %s -> %s", split[1], version)
@@ -158,7 +169,6 @@ func Get(name string) Recipe {
 	r := Recipe{
 		Name:       name,
 		EnvVersion: version,
-		EnvVersionRaw: versionRaw,
 		Dir:        dir,
 		GitURL:     gitURL,
 		SSHURL:     sshURL,
@@ -169,11 +179,9 @@ func Get(name string) Recipe {
 		AbraShPath:    path.Join(dir, "abra.sh"),
 	}
 
-	dirty, err := r.IsDirty()
+	if err := r.IsDirty(); err != nil && !errors.Is(err, git.ErrRepositoryNotExists) {
-	if err != nil && !errors.Is(err, git.ErrRepositoryNotExists) {
 		log.Fatalf("failed to check git status of %s: %s", r.Name, err)
 	}
-	r.Dirty = dirty
 
 	return r
 }
@@ -181,7 +189,6 @@ func Get(name string) Recipe {
 type Recipe struct {
 	Name       string
 	EnvVersion string
-	EnvVersionRaw string
 	Dirty      bool // NOTE(d1): git terminology for unstaged changes
 	Dir        string
 	GitURL     string

pkg/recipe/recipe_test.go

@@ -34,7 +34,6 @@ func TestGet(t *testing.T) {
 			recipe: Recipe{
 				Name:          "foo",
 				EnvVersion:    "1.2.3",
-				EnvVersionRaw: "1.2.3",
 				Dir:           path.Join(cfg.GetAbraDir(), "/recipes/foo"),
 				GitURL:        "https://git.coopcloud.tech/coop-cloud/foo.git",
 				SSHURL:        "ssh://git@git.coopcloud.tech:2222/coop-cloud/foo.git",
@@ -62,22 +61,6 @@ func TestGet(t *testing.T) {
 			recipe: Recipe{
 				Name:          "mygit.org/myorg/cool-recipe",
 				EnvVersion:    "1.2.4",
-				EnvVersionRaw: "1.2.4",
-				Dir:           path.Join(cfg.GetAbraDir(), "/recipes/mygit_org_myorg_cool-recipe"),
-				GitURL:        "https://mygit.org/myorg/cool-recipe.git",
-				SSHURL:        "ssh://git@mygit.org/myorg/cool-recipe.git",
-				ComposePath:   path.Join(cfg.GetAbraDir(), "recipes/mygit_org_myorg_cool-recipe/compose.yml"),
-				ReadmePath:    path.Join(cfg.GetAbraDir(), "recipes/mygit_org_myorg_cool-recipe/README.md"),
-				SampleEnvPath: path.Join(cfg.GetAbraDir(), "recipes/mygit_org_myorg_cool-recipe/.env.sample"),
-				AbraShPath:    path.Join(cfg.GetAbraDir(), "recipes/mygit_org_myorg_cool-recipe/abra.sh"),
-			},
-		},
-		{
-			name: "mygit.org/myorg/cool-recipe:1e83340e+U",
-			recipe: Recipe{
-				Name:          "mygit.org/myorg/cool-recipe",
-				EnvVersion:    "1e83340e",
-				EnvVersionRaw: "1e83340e+U",
 				Dir:           path.Join(cfg.GetAbraDir(), "/recipes/mygit_org_myorg_cool-recipe"),
 				GitURL:        "https://mygit.org/myorg/cool-recipe.git",
 				SSHURL:        "ssh://git@mygit.org/myorg/cool-recipe.git",
@@ -122,3 +105,16 @@ func TestGetVersionLabelLocalDoesNotUseTimeoutLabel(t *testing.T) {
 		assert.NotEqual(t, label, defaultTimeoutLabel)
 	}
 }
+
+func TestDirtyMarkerRemoved(t *testing.T) {
+	r := Get("abra-test-recipe:1e83340e+U")
+	assert.Equal(t, "1e83340e", r.EnvVersion)
+}
+
+func TestGetEnvVersionRaw(t *testing.T) {
+	v, err := GetEnvVersionRaw("abra-test-recipe:1e83340e+U")
+	if err != nil {
+		t.Fatal(err)
+	}
+	assert.Equal(t, "1e83340e+U", v)
+}

pkg/secret/secret.go

@@ -33,10 +33,6 @@ type Secret struct {
 	// variable. For Example:
 	//   SECRET_FOO=v1 # length=12
 	Length int
-	// Charset comes from the charset modifier at the secret version environment
-	// variable. For Example:
-	//   SECRET_FOO=v1 # charset=default,special
-	Charset string
 	// RemoteName is the name of the secret on the server. For example:
 	//   name: ${STACK_NAME}_test_pass_two_${SECRET_TEST_PASS_TWO_VERSION}
 	// With the following:
@@ -47,38 +43,38 @@ type Secret struct {
 	RemoteName string
 }
 
-// GeneratePassword generates passwords.
+// GeneratePasswords generates passwords.
-func GeneratePassword(length uint, charset string) (string, error) {
+func GeneratePasswords(count, length uint) ([]string, error) {
 	passwords, err := passgen.GeneratePasswords(
-		1,
+		count,
 		length,
-		charset,
+		passgen.AlphabetDefault,
 	)
 	if err != nil {
-		return "", err
+		return nil, err
 	}
 
 	log.Debugf("generated %s", strings.Join(passwords, ", "))
 
-	return passwords[0], nil
+	return passwords, nil
 }
 
-// GeneratePassphrase generates human readable and rememberable passphrases.
+// GeneratePassphrases generates human readable and rememberable passphrases.
-func GeneratePassphrase() (string, error) {
+func GeneratePassphrases(count uint) ([]string, error) {
 	passphrases, err := passgen.GeneratePassphrases(
-		1,
+		count,
 		passgen.PassphraseWordCountDefault,
 		rune('-'),
 		passgen.PassphraseCasingDefault,
 		passgen.WordListDefault,
 	)
 	if err != nil {
-		return "", err
+		return nil, err
 	}
 
 	log.Debugf("generated %s", strings.Join(passphrases, ", "))
 
-	return passphrases[0], nil
+	return passphrases, nil
 }
 
 // ReadSecretsConfig reads secret names/versions from the recipe config. The
@@ -154,8 +150,6 @@ func ReadSecretsConfig(appEnvPath string, composeFiles []string, stackName strin
 				}
 				value.Length = length
 			}
-
-			value.Charset = resolveCharset(modifierValues["charset"])
 			break
 		}
 		secretValues[secretId] = value
@@ -164,22 +158,6 @@ func ReadSecretsConfig(appEnvPath string, composeFiles []string, stackName strin
 	return secretValues, nil
 }
 
-// resolveCharset sets the passgen Alphabet required for a secret
-func resolveCharset(input string) string {
-	switch strings.ToLower(input) {
-	case "special":
-		return passgen.AlphabetSpecial
-	case "safespecial":
-		return "!@#%^&*_-+="
-	case "default,special", "special,default":
-		return passgen.AlphabetDefault + passgen.AlphabetSpecial
-	case "default,safespecial", "safespecial,default":
-		return passgen.AlphabetDefault + "!@#%^&*_-+="
-	default:
-		return passgen.AlphabetDefault // Fallback to default
-	}
-}
-
 // GenerateSecrets generates secrets locally and sends them to a remote server for storage.
 func GenerateSecrets(cl *dockerClient.Client, secrets map[string]Secret, server string) (map[string]string, error) {
 	secretsGenerated := map[string]string{}
@@ -195,13 +173,13 @@ func GenerateSecrets(cl *dockerClient.Client, secrets map[string]Secret, server
 			log.Debugf("attempting to generate and store %s on %s", secret.RemoteName, server)
 
 			if secret.Length > 0 {
-				password, err := GeneratePassword(uint(secret.Length), secret.Charset)
+				passwords, err := GeneratePasswords(1, uint(secret.Length))
 				if err != nil {
 					ch <- err
 					return
 				}
 
-				if err := client.StoreSecret(cl, secret.RemoteName, password, server); err != nil {
+				if err := client.StoreSecret(cl, secret.RemoteName, passwords[0], server); err != nil {
 					if strings.Contains(err.Error(), "AlreadyExists") {
 						log.Warnf("%s already exists", secret.RemoteName)
 						ch <- nil
@@ -213,15 +191,15 @@ func GenerateSecrets(cl *dockerClient.Client, secrets map[string]Secret, server
 
 				mutex.Lock()
 				defer mutex.Unlock()
-				secretsGenerated[secretName] = password
+				secretsGenerated[secretName] = passwords[0]
 			} else {
-				passphrase, err := GeneratePassphrase()
+				passphrases, err := GeneratePassphrases(1)
 				if err != nil {
 					ch <- err
 					return
 				}
 
-				if err := client.StoreSecret(cl, secret.RemoteName, passphrase, server); err != nil {
+				if err := client.StoreSecret(cl, secret.RemoteName, passphrases[0], server); err != nil {
 					if strings.Contains(err.Error(), "AlreadyExists") {
 						log.Warnf("%s already exists", secret.RemoteName)
 						ch <- nil
@@ -233,7 +211,7 @@ func GenerateSecrets(cl *dockerClient.Client, secrets map[string]Secret, server
 
 				mutex.Lock()
 				defer mutex.Unlock()
-				secretsGenerated[secretName] = passphrase
+				secretsGenerated[secretName] = passphrases[0]
 			}
 			ch <- nil
 		}(n, v)

pkg/secret/secret_test.go

@@ -17,37 +17,16 @@ func TestReadSecretsConfig(t *testing.T) {
 	assert.Equal(t, "test_example_com_test_pass_one_v2", secretsFromConfig["test_pass_one"].RemoteName)
 	assert.Equal(t, "v2", secretsFromConfig["test_pass_one"].Version)
 	assert.Equal(t, 0, secretsFromConfig["test_pass_one"].Length)
-	assert.Equal(t, "abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789", secretsFromConfig["test_pass_one"].Charset)
 
 	// Has a length modifier
 	assert.Equal(t, "test_example_com_test_pass_two_v1", secretsFromConfig["test_pass_two"].RemoteName)
 	assert.Equal(t, "v1", secretsFromConfig["test_pass_two"].Version)
 	assert.Equal(t, 10, secretsFromConfig["test_pass_two"].Length)
-	assert.Equal(t, "abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789", secretsFromConfig["test_pass_two"].Charset)
 
 	// Secret name does not include the secret id
 	assert.Equal(t, "test_example_com_pass_three_v2", secretsFromConfig["test_pass_three"].RemoteName)
 	assert.Equal(t, "v2", secretsFromConfig["test_pass_three"].Version)
 	assert.Equal(t, 0, secretsFromConfig["test_pass_three"].Length)
-	assert.Equal(t, "abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789", secretsFromConfig["test_pass_three"].Charset)
-
-	// Has a length modifier and a charset=default,safespecial modifier
-	assert.Equal(t, "test_example_com_test_pass_four_v1", secretsFromConfig["test_pass_four"].RemoteName)
-	assert.Equal(t, "v1", secretsFromConfig["test_pass_four"].Version)
-	assert.Equal(t, 12, secretsFromConfig["test_pass_four"].Length)
-	assert.Equal(t, "abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789!@#%^&*_-+=", secretsFromConfig["test_pass_four"].Charset)
-
-	// Has a length modifier and a charset=default,special modifier
-	assert.Equal(t, "test_example_com_test_pass_five_v1", secretsFromConfig["test_pass_five"].RemoteName)
-	assert.Equal(t, "v1", secretsFromConfig["test_pass_five"].Version)
-	assert.Equal(t, 12, secretsFromConfig["test_pass_five"].Length)
-	assert.Equal(t, "abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789!@#$%^&*_-+=", secretsFromConfig["test_pass_five"].Charset)
-
-	// Has only a charset=default,special modifier, which gets setted but ignored in the generation
-	assert.Equal(t, "test_example_com_test_pass_six_v1", secretsFromConfig["test_pass_six"].RemoteName)
-	assert.Equal(t, "v1", secretsFromConfig["test_pass_six"].Version)
-	assert.Equal(t, 0, secretsFromConfig["test_pass_six"].Length)
-	assert.Equal(t, "abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789!@#$%^&*_-+=", secretsFromConfig["test_pass_six"].Charset)
 }
 
 func TestReadSecretsConfigWithLongDomain(t *testing.T) {

pkg/secret/testdir/.env.sample

@@ -1,6 +1,3 @@
 SECRET_TEST_PASS_ONE_VERSION=v2
 SECRET_TEST_PASS_TWO_VERSION=v1 # length=10
 SECRET_TEST_PASS_THREE_VERSION=v2
-SECRET_TEST_PASS_FOUR_VERSION=v1 # length=12 charset=default,safespecial
-SECRET_TEST_PASS_FIVE_VERSION=v1 # length=12 charset=default,special
-SECRET_TEST_PASS_SIX_VERSION=v1 # charset=default,special

pkg/secret/testdir/compose.yaml

@@ -8,9 +8,6 @@ services:
       - test_pass_one
       - test_pass_two
       - test_pass_three
-      - test_pass_four
-      - test_pass_five
-      - test_pass_six
 
 secrets:
   test_pass_one:
@@ -22,12 +19,3 @@ secrets:
   test_pass_three:
     external: true
     name: ${STACK_NAME}_pass_three_${SECRET_TEST_PASS_THREE_VERSION} # secretId and name don't match
-  test_pass_four:
-    external: true
-    name: ${STACK_NAME}_test_pass_four_${SECRET_TEST_PASS_FOUR_VERSION}
-  test_pass_five:
-    external: true
-    name: ${STACK_NAME}_test_pass_five_${SECRET_TEST_PASS_FIVE_VERSION}
-  test_pass_six:
-    external: true
-    name: ${STACK_NAME}_test_pass_six_${SECRET_TEST_PASS_SIX_VERSION}

pkg/ssh/ssh.go

@@ -20,8 +20,6 @@ func Fatal(hostname string, err error) error {
 		return fmt.Errorf("ssh auth: permission denied for %s", hostname)
 	} else if strings.Contains(out, "Network is unreachable") {
 		return fmt.Errorf("unable to connect to %s, please check your SSH config", hostname)
-	} else if strings.Contains(out, "Is the docker daemon running") {
-		return fmt.Errorf("docker: is the daemon running / your user has docker permissions?")
 	}
 
 	return err

pkg/ui/deploy.go

@@ -1,39 +1,47 @@
 package ui
 
 import (
+	"bytes"
 	"context"
 	"encoding/json"
 	"fmt"
 	"io"
-	"sort"
 	"strings"
 	"time"
 
 	"coopcloud.tech/abra/pkg/formatter"
 	"coopcloud.tech/abra/pkg/logs"
 	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
 	"github.com/docker/cli/cli/command/service/progress"
 	containerTypes "github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/filters"
 	dockerClient "github.com/docker/docker/client"
 	"github.com/docker/docker/pkg/jsonmessage"
+	"github.com/muesli/reflow/wordwrap"
 )
 
-var IsRunning bool
-
 type statusMsg struct {
 	stream  stream
 	jsonMsg jsonmessage.JSONMessage
 }
 
-type progressCompleteMsg struct {
+type healthState struct {
-	stream stream
+	log string
-	failed bool
 }
 
 type healthcheckMsg struct {
 	stream stream
-	health string
+	state  healthState
+}
+
+type progressCompleteMsg struct {
+	stream stream
+
+	// NOTE(d1): failure scenarios are as follows
+	//           an error from ServiceProgress
+	//           a rollback
+	failed bool
 }
 
 type ServiceMeta struct {
@@ -46,15 +54,16 @@ type Model struct {
 	cl      *dockerClient.Client
 	count   int
 	ctx     context.Context
+	err     error
+	info    string
 	timeout time.Duration
 	width   int
-	filters filters.Args
+
+	LogsBuffer *bytes.Buffer
 
 	Streams *[]stream
-	Logs     *[]string
 	Failed  bool
-	TimedOut bool
+	Timeout bool
-	Quit     bool
 }
 
 func (m Model) complete() bool {
@@ -65,17 +74,18 @@ func (m Model) complete() bool {
 }
 
 type stream struct {
-	Name string
-	Err  error
-
 	decoder           *json.Decoder
 	id                string
 	reader            *io.PipeReader
 	writer            *io.PipeWriter
-	status   string
+	overallStatus     string
-	retries  int
+	rollbackStatus    string
-	health   string
+	verifyStatus      string
-	rollback bool
+	healthcheckStatus string
+
+	Err       error
+	ErrStatus string
+	Name      string
 }
 
 func (s stream) String() string {
@@ -85,12 +95,17 @@ func (s stream) String() string {
 	out += fmt.Sprintf("name: %s, ", s.Name)
 	out += fmt.Sprintf("reader: %v, ", s.reader)
 	out += fmt.Sprintf("writer: %v, ", s.writer)
-	out += fmt.Sprintf("status: %s, ", s.status)
+	out += fmt.Sprintf("overallStatus: %s, ", s.overallStatus)
+	out += fmt.Sprintf("rollbackStatus: %s, ", s.rollbackStatus)
+	out += fmt.Sprintf("verifyStatus: %s, ", s.verifyStatus)
+	out += fmt.Sprintf("errStatus: %s, ", s.ErrStatus)
+	out += fmt.Sprintf("healthcheckStatus: %s}", s.healthcheckStatus)
 	return out
 }
 
 func (s stream) progress(m Model) tea.Msg {
 	if err := progress.ServiceProgress(m.ctx, m.cl, s.id, s.writer); err != nil {
+		s.Err = err
 		return progressCompleteMsg{
 			stream: s,
 			failed: true,
@@ -108,6 +123,8 @@ func (s stream) process() tea.Msg {
 			// NOTE(d1): end processing messages
 			return nil
 		}
+
+		s.Err = err
 	}
 
 	return statusMsg{
@@ -137,12 +154,22 @@ func (s stream) healthcheck(m Model) tea.Msg {
 		return healthcheckMsg{stream: s}
 	}
 
-	var health string
+	var log string
 	if containerState.State.Health != nil {
-		health = containerState.State.Health.Status
+		if len(containerState.State.Health.Log) > 0 {
+			entry := containerState.State.Health.Log[0]
+			if entry.ExitCode < 0 {
+				log = entry.Output
+			}
 		}
 
-	return healthcheckMsg{stream: s, health: health}
+		return healthcheckMsg{
+			stream: s,
+			state:  healthState{log: log},
+		}
+	}
+
+	return healthcheckMsg{stream: s}
 }
 
 func DeployInitialModel(
@@ -151,7 +178,6 @@ func DeployInitialModel(
 	services []ServiceMeta,
 	appName string,
 	timeout time.Duration,
-	filters filters.Args,
 ) Model {
 	var streams []stream
 	for _, service := range services {
@@ -163,23 +189,25 @@ func DeployInitialModel(
 			reader:  r,
 			writer:  w,
 			decoder: d,
-			retries: -1, // NOTE(d1): skip first attempt
-			health:  "?",
 		})
 	}
 
-	sort.Slice(streams, func(i, j int) bool {
+	infoRenderer := lipgloss.NewStyle().
-		return streams[i].Name < streams[j].Name
+		Bold(true).
-	})
+		MaxWidth(4).
+		Foreground(lipgloss.Color("86"))
+	infoMarker := infoRenderer.Render("INFO")
+
+	var logsBuffer bytes.Buffer
 
 	return Model{
 		ctx:        ctx,
 		cl:         cl,
 		appName:    appName,
 		timeout:    timeout,
-		filters: filters,
 		Streams:    &streams,
-		Logs:    &[]string{},
+		info:       infoMarker,
+		LogsBuffer: &logsBuffer,
 	}
 }
 
@@ -213,14 +241,14 @@ func (m Model) gatherLogs() tea.Msg {
 		AppName:  m.appName,
 		Services: services,
 		StdErr:   true,
-		Buffer:   m.Logs,
+		Buffer:   m.LogsBuffer,
 		ToBuffer: true,
-		Filters:  m.filters,
 	}
 
-	// NOTE(d1): not interested in log polling errors. if we don't see logs it
+	if err := logs.TailLogs(m.cl, opts); err != nil {
-	// will hopefully be self-evident based on what happened in the deployment
+		// TODO
-	logs.TailLogs(m.cl, opts)
+		// log.Debugf("gatherLogs: %s", err)
+	}
 
 	return nil
 }
@@ -239,7 +267,6 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	case tea.KeyMsg:
 		switch msg.String() {
 		case "ctrl+c", "q":
-			m.Quit = true
 			return m, tea.Quit
 		}
 
@@ -257,21 +284,18 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			return m, tea.Quit
 		}
 
-	case timeoutMsg:
-		m.TimedOut = true
-		return m, tea.Quit
-
 	case healthcheckMsg:
+		if msg.state != (healthState{}) && msg.state.log != "" {
+			msg.stream.healthcheckStatus = strings.ToLower(msg.state.log)
+
+			if msg.stream.Err != nil {
+				msg.stream.ErrStatus = msg.stream.Err.Error()
+			}
+
 			for idx, s := range *m.Streams {
 				if s.id == msg.stream.id {
-				h := "?"
+					(*m.Streams)[idx].healthcheckStatus = msg.stream.healthcheckStatus
-				if s.health != "" {
-					h = s.health
 				}
-				if msg.health != "" {
-					h = msg.health
-				}
-				(*m.Streams)[idx].health = h
 			}
 		}
 
@@ -280,31 +304,34 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			func() tea.Msg { return msg.stream.healthcheck(m) },
 		)
 
+	case timeoutMsg:
+		m.Timeout = true
+		return m, tea.Quit
+
 	case statusMsg:
+		switch msg.jsonMsg.ID {
+		case "rollback":
+			m.Failed = true
+			msg.stream.rollbackStatus = strings.ToLower(msg.jsonMsg.Status)
+		case "overall progress":
+			msg.stream.overallStatus = strings.ToLower(msg.jsonMsg.Status)
+		case "verify":
+			msg.stream.verifyStatus = strings.ToLower(msg.jsonMsg.Status)
+		}
+
+		if msg.stream.Err != nil {
+			msg.stream.ErrStatus = msg.stream.Err.Error()
+		}
+
 		for idx, s := range *m.Streams {
 			if s.id == msg.stream.id {
-
+				switch msg.jsonMsg.ID {
-				if msg.jsonMsg.ID == "rollback" {
+				case "rollback":
-					m.Failed = true
+					(*m.Streams)[idx].rollbackStatus = msg.stream.rollbackStatus
-					(*m.Streams)[idx].rollback = true
+				case "overall progress":
-				}
+					(*m.Streams)[idx].overallStatus = msg.stream.overallStatus
-
+				case "verify":
-				if msg.jsonMsg.ID != "overall progress" {
+					(*m.Streams)[idx].verifyStatus = msg.stream.verifyStatus
-					newStatus := strings.ToLower(msg.jsonMsg.Status)
-					currentStatus := (*m.Streams)[idx].status
-
-					if !strings.Contains(currentStatus, "starting") &&
-						strings.Contains(newStatus, "starting") {
-						(*m.Streams)[idx].retries += 1
-					}
-
-					if (*m.Streams)[idx].rollback {
-						if msg.jsonMsg.ID == "rollback" {
-							(*m.Streams)[idx].status = newStatus
-						}
-					} else {
-						(*m.Streams)[idx].status = newStatus
-					}
 				}
 			}
 		}
@@ -325,29 +352,70 @@ func (m Model) View() string {
 		split := strings.Split(stream.Name, "_")
 		short := split[len(split)-1]
 
-		status := stream.status
+		newLineSpacing := "       "
-		if strings.Contains(stream.status, "converged") && !stream.rollback {
+		for range len(short) {
-			status = "succeeded"
+			newLineSpacing += " "
-		}
-		if strings.Contains(stream.status, "rolled back") {
-			status = "rolled back"
 		}
 
-		retries := 0
+		output := fmt.Sprintf("%s %s: %s",
-		if stream.retries > 0 {
+			m.info,
-			retries = stream.retries
-		}
-
-		output := fmt.Sprintf("%s: %s (retries: %v, healthcheck: %s)",
 			formatter.BoldStyle.Render(short),
-			status,
+			stream.overallStatus,
-			retries,
-			stream.health,
 		)
 
+		if stream.verifyStatus != "" {
+			output += fmt.Sprintf(" (%s)", stream.verifyStatus)
+		}
+
+		if stream.rollbackStatus != "" {
+			output += fmt.Sprintf("\n%s%s: %s",
+				newLineSpacing,
+				formatter.BoldUnderlineStyle.Render("ROLLBACK"),
+				stream.rollbackStatus,
+			)
+		}
+
+		if stream.healthcheckStatus != "" {
+			output += fmt.Sprintf("\n%s%s: %s",
+				newLineSpacing,
+				formatter.BoldUnderlineStyle.Render("HEALTHCHECK"),
+				wrapHealthstatus(m, stream, newLineSpacing),
+			)
+		}
+
+		if stream.ErrStatus != "" {
+			output += fmt.Sprintf("\n%s%s: %s",
+				newLineSpacing,
+				formatter.BoldUnderlineStyle.Render("ERROR"),
+				stream.ErrStatus,
+			)
+		}
+
 		body.WriteString(output)
 		body.WriteString("\n")
 	}
 
 	return body.String()
 }
+
+// wrapHealthstatus wraps the health check output which is mostly quite long.
+func wrapHealthstatus(m Model, s stream, newLineSpacing string) string {
+	// NOTE(d1): the spacing here represents "HEALTCHECK: ". 20 is an arbitrary
+	//           padding chosen in the hope of not overrunning horizontal space.
+	newLineSpacingWithIndent := newLineSpacing + "             "
+	firstWrap := wordwrap.String(
+		s.healthcheckStatus,
+		((m.width - len(newLineSpacingWithIndent)) - 20),
+	)
+
+	var finalWrap string
+	for idx, line := range strings.Split(firstWrap, "\n") {
+		if idx == 0 {
+			finalWrap = line
+			continue
+		}
+		finalWrap += fmt.Sprintf("\n%s%s", newLineSpacingWithIndent, line)
+	}
+
+	return finalWrap
+}

pkg/upstream/container/exec.go

@@ -9,14 +9,14 @@ import (
 	"coopcloud.tech/abra/pkg/log"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/docker/api/types/container"
+	"github.com/docker/docker/api/types"
 	apiclient "github.com/docker/docker/client"
 )
 
 // RunExec runs a command on a remote container. io.Writer corresponds to the
 // command output.
 func RunExec(dockerCli command.Cli, client *apiclient.Client, containerID string,
-	execOptions *container.ExecOptions) (io.Writer, error) {
+	execConfig *types.ExecConfig) (io.Writer, error) {
 	ctx := context.Background()
 
 	// We need to check the tty _before_ we do the ContainerExecCreate, because
@@ -26,13 +26,13 @@ func RunExec(dockerCli command.Cli, client *apiclient.Client, containerID string
 	if _, err := client.ContainerInspect(ctx, containerID); err != nil {
 		return nil, err
 	}
-	if !execOptions.Detach {
+	if !execConfig.Detach {
-		if err := dockerCli.In().CheckTty(execOptions.AttachStdin, execOptions.Tty); err != nil {
+		if err := dockerCli.In().CheckTty(execConfig.AttachStdin, execConfig.Tty); err != nil {
 			return nil, err
 		}
 	}
 
-	response, err := client.ContainerExecCreate(ctx, containerID, *execOptions)
+	response, err := client.ContainerExecCreate(ctx, containerID, *execConfig)
 	if err != nil {
 		return nil, err
 	}
@@ -42,40 +42,40 @@ func RunExec(dockerCli command.Cli, client *apiclient.Client, containerID string
 		return nil, errors.New("exec ID empty")
 	}
 
-	if execOptions.Detach {
+	if execConfig.Detach {
-		execStartCheck := container.ExecStartOptions{
+		execStartCheck := types.ExecStartCheck{
-			Detach: execOptions.Detach,
+			Detach: execConfig.Detach,
-			Tty:    execOptions.Tty,
+			Tty:    execConfig.Tty,
 		}
 		return nil, client.ContainerExecStart(ctx, execID, execStartCheck)
 	}
-	return interactiveExec(ctx, dockerCli, client, execOptions, execID)
+	return interactiveExec(ctx, dockerCli, client, execConfig, execID)
 }
 
 func interactiveExec(ctx context.Context, dockerCli command.Cli, client *apiclient.Client,
-	execOpts *container.ExecOptions, execID string) (io.Writer, error) {
+	execConfig *types.ExecConfig, execID string) (io.Writer, error) {
 	// Interactive exec requested.
 	var (
 		out, stderr io.Writer
 		in          io.ReadCloser
 	)
 
-	if execOpts.AttachStdin {
+	if execConfig.AttachStdin {
 		in = dockerCli.In()
 	}
-	if execOpts.AttachStdout {
+	if execConfig.AttachStdout {
 		out = dockerCli.Out()
 	}
-	if execOpts.AttachStderr {
+	if execConfig.AttachStderr {
-		if execOpts.Tty {
+		if execConfig.Tty {
 			stderr = dockerCli.Out()
 		} else {
 			stderr = dockerCli.Err()
 		}
 	}
 
-	execStartCheck := container.ExecStartOptions{
+	execStartCheck := types.ExecStartCheck{
-		Tty: execOpts.Tty,
+		Tty: execConfig.Tty,
 	}
 	resp, err := client.ContainerExecAttach(ctx, execID, execStartCheck)
 	if err != nil {
@@ -94,15 +94,15 @@ func interactiveExec(ctx context.Context, dockerCli command.Cli, client *apiclie
 				outputStream: out,
 				errorStream:  stderr,
 				resp:         resp,
-				tty:          execOpts.Tty,
+				tty:          execConfig.Tty,
-				detachKeys:   execOpts.DetachKeys,
+				detachKeys:   execConfig.DetachKeys,
 			}
 
 			return streamer.stream(ctx)
 		}()
 	}()
 
-	if execOpts.Tty && dockerCli.In().IsTerminal() {
+	if execConfig.Tty && dockerCli.In().IsTerminal() {
 		if err := MonitorTtySize(ctx, client, dockerCli, execID, true); err != nil {
 			fmt.Fprintln(dockerCli.Err(), "Error monitoring TTY size:", err)
 		}

pkg/upstream/convert/compose.go

@@ -5,6 +5,7 @@ import (
 	"strings"
 
 	composetypes "github.com/docker/cli/cli/compose/types"
+	"github.com/docker/docker/api/types"
 	networktypes "github.com/docker/docker/api/types/network"
 	"github.com/docker/docker/api/types/swarm"
 )
@@ -51,13 +52,13 @@ func AddStackLabel(namespace Namespace, labels map[string]string) map[string]str
 type networkMap map[string]composetypes.NetworkConfig
 
 // Networks from the compose-file type to the engine API type
-func Networks(namespace Namespace, networks networkMap, servicesNetworks map[string]struct{}) (map[string]networktypes.CreateOptions, []string) {
+func Networks(namespace Namespace, networks networkMap, servicesNetworks map[string]struct{}) (map[string]types.NetworkCreate, []string) {
 	if networks == nil {
 		networks = make(map[string]composetypes.NetworkConfig)
 	}
 
 	externalNetworks := []string{}
-	result := make(map[string]networktypes.CreateOptions)
+	result := make(map[string]types.NetworkCreate)
 	for internalName := range servicesNetworks {
 		network := networks[internalName]
 		if network.External.External {
@@ -65,7 +66,7 @@ func Networks(namespace Namespace, networks networkMap, servicesNetworks map[str
 			continue
 		}
 
-		createOpts := networktypes.CreateOptions{
+		createOpts := types.NetworkCreate{
 			Labels:     AddStackLabel(namespace, network.Labels),
 			Driver:     network.Driver,
 			Options:    network.DriverOpts,

pkg/upstream/convert/compose_test.go

@@ -4,6 +4,7 @@ import (
 	"testing"
 
 	composetypes "github.com/docker/cli/cli/compose/types"
+	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/network"
 	"gotest.tools/v3/assert"
 	is "gotest.tools/v3/assert/cmp"
@@ -66,7 +67,7 @@ func TestNetworks(t *testing.T) {
 			Name: "othername",
 		},
 	}
-	expected := map[string]network.CreateOptions{
+	expected := map[string]types.NetworkCreate{
 		"foo_default": {
 			Labels: map[string]string{
 				LabelNamespace: "foo",

pkg/upstream/stack/remove.go

@@ -3,15 +3,11 @@ package stack // https://github.com/docker/cli/blob/master/cli/command/stack/rem
 import (
 	"context"
 	"fmt"
-	"os"
-	"os/signal"
 	"sort"
 	"strings"
-	"time"
 
 	"coopcloud.tech/abra/pkg/log"
 	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/network"
 	"github.com/docker/docker/api/types/swarm"
 	"github.com/docker/docker/api/types/versions"
 	"github.com/docker/docker/client"
@@ -21,34 +17,23 @@ import (
 
 // RunRemove is the swarm implementation of docker stack remove
 func RunRemove(ctx context.Context, client *apiclient.Client, opts Remove) error {
-	sigIntCh := make(chan os.Signal, 1)
-	signal.Notify(sigIntCh, os.Interrupt)
-	defer signal.Stop(sigIntCh)
-
-	waitCh := make(chan struct{})
-	errCh := make(chan error)
-
-	go func() {
 	var errs []string
 	for _, namespace := range opts.Namespaces {
 		services, err := GetStackServices(ctx, client, namespace)
 		if err != nil {
-				errCh <- err
+			return err
-				return
 		}
 
 		networks, err := getStackNetworks(ctx, client, namespace)
 		if err != nil {
-				errCh <- err
+			return err
-				return
 		}
 
 		var secrets []swarm.Secret
 		if versions.GreaterThanOrEqualTo(client.ClientVersion(), "1.25") {
 			secrets, err = getStackSecrets(ctx, client, namespace)
 			if err != nil {
-					errCh <- err
+				return err
-					return
 			}
 		}
 
@@ -56,8 +41,7 @@ func RunRemove(ctx context.Context, client *apiclient.Client, opts Remove) error
 		if versions.GreaterThanOrEqualTo(client.ClientVersion(), "1.30") {
 			configs, err = getStackConfigs(ctx, client, namespace)
 			if err != nil {
-					errCh <- err
+				return err
-					return
 			}
 		}
 
@@ -76,32 +60,14 @@ func RunRemove(ctx context.Context, client *apiclient.Client, opts Remove) error
 			continue
 		}
 
-			log.Info("polling undeploy status")
+		err = waitOnTasks(ctx, client, namespace)
-			timeout, err := waitOnTasks(ctx, client, namespace)
-			if timeout {
-				errs = append(errs, err.Error())
-			} else {
 		if err != nil {
 			errs = append(errs, fmt.Sprintf("failed to wait on tasks of stack: %s: %s", namespace, err))
 		}
 	}
-		}
 
 	if len(errs) > 0 {
-			errCh <- errors.Errorf(strings.Join(errs, "\n"))
+		return errors.Errorf(strings.Join(errs, "\n"))
-			return
-		}
-
-		close(waitCh)
-	}()
-
-	select {
-	case <-waitCh:
-		return nil
-	case <-sigIntCh:
-		return fmt.Errorf("skipping as requested, undeploy still in progress 🟠")
-	case err := <-errCh:
-		return err
 	}
 
 	return nil
@@ -133,7 +99,7 @@ func removeServices(
 func removeNetworks(
 	ctx context.Context,
 	client *apiclient.Client,
-	networks []network.Inspect,
+	networks []types.NetworkResource,
 ) bool {
 	var hasError bool
 	for _, network := range networks {
@@ -203,23 +169,12 @@ func terminalState(state swarm.TaskState) bool {
 	return numberedStates[state] > numberedStates[swarm.TaskStateRunning]
 }
 
-func waitOnTasks(ctx context.Context, client apiclient.APIClient, namespace string) (bool, error) {
+func waitOnTasks(ctx context.Context, client apiclient.APIClient, namespace string) error {
-	var timedOut bool
-
-	log.Debugf("waiting on undeploy tasks (timeout=%v secs)", WaitTimeout)
-
-	go func() {
-		t := time.Duration(WaitTimeout) * time.Second
-		<-time.After(t)
-		log.Debug("timed out on undeploy")
-		timedOut = true
-	}()
-
 	terminalStatesReached := 0
 	for {
 		tasks, err := getStackTasks(ctx, client, namespace)
 		if err != nil {
-			return false, fmt.Errorf("failed to get tasks: %w", err)
+			return fmt.Errorf("failed to get tasks: %w", err)
 		}
 
 		for _, task := range tasks {
@@ -232,11 +187,6 @@ func waitOnTasks(ctx context.Context, client apiclient.APIClient, namespace stri
 		if terminalStatesReached == len(tasks) {
 			break
 		}
-
-		if timedOut {
-			return true, fmt.Errorf("deployment timed out 🟠")
 	}
-	}
+	return nil
-
-	return false, nil
 }

pkg/upstream/stack/stack.go

@@ -22,7 +22,6 @@ import (
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/filters"
-	networktypes "github.com/docker/docker/api/types/network"
 	"github.com/docker/docker/api/types/swarm"
 	"github.com/docker/docker/api/types/versions"
 	"github.com/docker/docker/client"
@@ -198,7 +197,6 @@ func RunDeploy(
 	appName string,
 	serverName string,
 	dontWait bool,
-	filters filters.Args,
 ) error {
 	log.Info("initialising deployment")
 
@@ -211,16 +209,7 @@ func RunDeploy(
 		opts.ResolveImage = ResolveImageNever
 	}
 
-	return deployCompose(
+	return deployCompose(context.Background(), cl, opts, cfg, appName, serverName, dontWait)
-		context.Background(),
-		cl,
-		opts,
-		cfg,
-		appName,
-		serverName,
-		dontWait,
-		filters,
-	)
 }
 
 // validateResolveImageFlag validates the opts.resolveImage command line option
@@ -241,7 +230,6 @@ func deployCompose(
 	appName string,
 	serverName string,
 	dontWait bool,
-	filters filters.Args,
 ) error {
 	namespace := convert.NewNamespace(opts.Namespace)
 
@@ -300,14 +288,13 @@ func deployCompose(
 		return nil
 	}
 
-	waitOpts := WaitOpts{
+	if err := WaitOnServices(
-		Services:   serviceIDs,
+		ctx,
-		AppName:    appName,
+		cl,
-		ServerName: serverName,
+		serviceIDs,
-		Filters:    filters,
+		appName,
-	}
+		serverName,
-
+	); err != nil {
-	if err := WaitOnServices(ctx, cl, waitOpts); err != nil {
 		return err
 	}
 
@@ -335,7 +322,7 @@ func validateExternalNetworks(ctx context.Context, client dockerClient.NetworkAP
 			// local-scoped networks, so there's no need to inspect them.
 			continue
 		}
-		network, err := client.NetworkInspect(ctx, networkName, networktypes.InspectOptions{})
+		network, err := client.NetworkInspect(ctx, networkName, types.NetworkInspectOptions{})
 		switch {
 		case dockerClient.IsErrNotFound(err):
 			return errors.Errorf("network %q is declared as external, but could not be found. You need to create a swarm-scoped network before the stack is deployed, which you can do by running this on the server: docker network create -d overlay proxy", networkName)
@@ -392,13 +379,13 @@ func createConfigs(ctx context.Context, cl *dockerClient.Client, configs []swarm
 	return nil
 }
 
-func createNetworks(ctx context.Context, cl *dockerClient.Client, namespace convert.Namespace, networks map[string]networktypes.CreateOptions) error {
+func createNetworks(ctx context.Context, cl *dockerClient.Client, namespace convert.Namespace, networks map[string]types.NetworkCreate) error {
 	existingNetworks, err := getStackNetworks(ctx, cl, namespace.Name())
 	if err != nil {
 		return err
 	}
 
-	existingNetworkMap := make(map[string]networktypes.Inspect)
+	existingNetworkMap := make(map[string]types.NetworkResource)
 	for _, network := range existingNetworks {
 		existingNetworkMap[network.Name] = network
 	}
@@ -518,8 +505,8 @@ func deployServices(
 	return servicesMeta, nil
 }
 
-func getStackNetworks(ctx context.Context, dockerclient client.APIClient, namespace string) ([]networktypes.Inspect, error) {
+func getStackNetworks(ctx context.Context, dockerclient client.APIClient, namespace string) ([]types.NetworkResource, error) {
-	return dockerclient.NetworkList(ctx, networktypes.ListOptions{Filters: getStackFilter(namespace)})
+	return dockerclient.NetworkList(ctx, types.NetworkListOptions{Filters: getStackFilter(namespace)})
 }
 
 func getStackSecrets(ctx context.Context, dockerclient client.APIClient, namespace string) ([]swarm.Secret, error) {
@@ -535,83 +522,64 @@ func timestamp() string {
 	return strings.Replace(ts, ":", "", -1) // get rid of offensive colons
 }
 
-type WaitOpts struct {
+func WaitOnServices(
-	AppName    string
+	ctx context.Context,
-	Filters    filters.Args
+	cl *dockerClient.Client,
-	NoLog      bool
+	services []ui.ServiceMeta,
-	Quiet      bool
+	appName string,
-	ServerName string
+	serverName string,
-	Services   []ui.ServiceMeta
+) error {
-}
+	log.Info("polling deployment status")
 
-func WaitOnServices(ctx context.Context, cl *dockerClient.Client, opts WaitOpts) error {
 	timeout := time.Duration(WaitTimeout) * time.Second
-	model := ui.DeployInitialModel(ctx, cl, opts.Services, opts.AppName, timeout, opts.Filters)
+	model := ui.DeployInitialModel(ctx, cl, services, appName, timeout)
 	tui := tea.NewProgram(model)
 
-	if !opts.Quiet {
+	m, err := tui.Run()
-		log.Info("polling deployment status")
-	}
-
-	m, err := log.Without(
-		func() (tea.Model, error) {
-			return tui.Run()
-		},
-	)
 	if err != nil {
-		return fmt.Errorf("waitOnServices: error running TUI: %s", err)
+		return err
 	}
 
 	deployModel := m.(ui.Model)
-	if deployModel.TimedOut || deployModel.Failed || deployModel.Quit {
+
-		var errs []error
+	logsPath := filepath.Join(
+		config.LOGS_DIR,
+		serverName,
+		fmt.Sprintf("%s_%s", appName, timestamp()),
+	)
+
+	if err := os.MkdirAll(filepath.Join(config.LOGS_DIR, serverName), 0644); err != nil {
+		// TODO
+		log.Fatalf("MkdirAll: %s", err)
+	}
+
+	if deployModel.Timeout {
+		if err := os.WriteFile(logsPath, deployModel.LogsBuffer.Bytes(), 0644); err != nil {
+			// TODO
+			log.Fatalf("WriteFile: %s", err)
+		}
+		return fmt.Errorf("deployment timed out, logs in %s", logsPath)
+	}
 
 	if deployModel.Failed {
-			errs = append(errs, fmt.Errorf("deploy failed 🛑"))
+		var errs []error
-		} else if deployModel.TimedOut {
-			errs = append(errs, fmt.Errorf("deploy timed out 🟠"))
-		} else {
-			errs = append(errs, fmt.Errorf("deploy in progress 🟠"))
-		}
 
 		for _, s := range *deployModel.Streams {
 			if s.Err != nil {
-				errs = append(errs, fmt.Errorf("%s: %s", s.Name, s.Err))
+				errs = append(errs, fmt.Errorf("%s: %s", s.Name, s.ErrStatus))
 			}
 		}
 
-		if len(*deployModel.Logs) > 0 && !opts.NoLog {
+		if err := os.WriteFile(logsPath, deployModel.LogsBuffer.Bytes(), 0644); err != nil {
-			logsPath := filepath.Join(
+			// TODO
-				config.LOGS_DIR,
+			log.Fatalf("WriteFile: %s", err)
-				opts.ServerName,
-				fmt.Sprintf("%s_%s", opts.AppName, timestamp()),
-			)
-
-			if err := os.MkdirAll(filepath.Join(config.LOGS_DIR, opts.ServerName), 0764); err != nil {
-				return fmt.Errorf("waitOnServices: error creating log dir: %s", err)
 		}
 
-			file, err := os.Create(logsPath)
+		errs = append(errs, fmt.Errorf("deployment failed, logs in %s", logsPath))
-			if err != nil {
-				return fmt.Errorf("waitOnServices: error opening file: %s", err)
-			}
-			defer file.Close()
-
-			s := strings.Join(*deployModel.Logs, "\n")
-			if _, err := file.WriteString(s); err != nil {
-				return fmt.Errorf("waitOnServices: writeFile: %s", err)
-			}
-
-			errs = append(errs, fmt.Errorf("logs: %s", logsPath))
-		}
 
 		return stdlibErr.Join(errs...)
 	}
 
-	if !opts.Quiet {
-		log.Info("deploy succeeded 🟢")
-	}
-
 	return nil
 }
 

scripts/installer/installer

@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
-ABRA_VERSION="0.10.0-beta"
+ABRA_VERSION="0.9.0-beta"
 ABRA_RELEASE_URL="https://git.coopcloud.tech/api/v1/repos/toolshed/abra/releases/tags/$ABRA_VERSION"
-RC_VERSION="0.10.0-beta"
+RC_VERSION="0.10.0-rc1-beta"
 RC_VERSION_URL="https://git.coopcloud.tech/api/v1/repos/toolshed/abra/releases/tags/$RC_VERSION"
 
 for arg in "$@"; do

scripts/installer/makefile

@@ -3,5 +3,5 @@ STACK := abra_installer_script
 default: deploy
 
 deploy:
-	@DOCKER_CONTEXT=swarm-0.coopcloud.tech docker stack rm $(STACK) && \
+	@DOCKER_CONTEXT=swarm.autonomic.zone docker stack rm $(STACK) && \
-		DOCKER_CONTEXT=swarm-0.coopcloud.tech docker stack deploy -c compose.yml $(STACK)
+		DOCKER_CONTEXT=swarm.autonomic.zone docker stack deploy -c compose.yml $(STACK)

tests/integration/app_deploy.bats

@@ -22,8 +22,6 @@ setup(){
 teardown(){
   _reset_recipe
   _undeploy_app
-  _undeploy_app2 "gitea.$TEST_SERVER"
-
   _reset_app
   _reset_tags
 
@@ -108,6 +106,8 @@ teardown(){
 
 # bats test_tags=slow
 @test "deploy latest commit if no published versions and no --chaos" {
+  latestCommit="$(git -C "$ABRA_DIR/recipes/$TEST_RECIPE" rev-parse --short HEAD)"
+
   _remove_tags
   _wipe_env_version
 
@@ -115,7 +115,7 @@ teardown(){
   run $ABRA app deploy "$TEST_APP_DOMAIN" \
     --no-input --no-converge-checks --offline
   assert_success
-  assert_output --partial "${_get_head_hash:0:8}"
+  assert_output --partial "$latestCommit"
 }
 
 # bats test_tags=slow
@@ -222,6 +222,19 @@ teardown(){
   run $ABRA app deploy "gitea.$TEST_SERVER" --no-input --no-converge-checks
   assert_success
   assert_output --partial "$latestVersion"
+
+  run $ABRA app undeploy "gitea.$TEST_SERVER" --no-input
+  assert_success
+
+  run $ABRA app secret remove "gitea.$TEST_SERVER" --all --no-input
+  assert_success
+
+  run $ABRA app volume remove "gitea.$TEST_SERVER" --no-input
+  assert_success
+
+  run $ABRA app remove "gitea.$TEST_SERVER" --no-input
+  assert_success
+  assert_not_exists "$ABRA_DIR/servers/$TEST_SERVER/gitea.$TEST_SERVER.env"
 }
 
 # bats test_tags=slow
@@ -401,6 +414,8 @@ teardown(){
 
 # bats test_tags=slow
 @test "ignore env version on new deploy" {
+  tagHash=$(_get_tag_hash "0.1.0+1.20.0")
+
   run $ABRA app deploy "$TEST_APP_DOMAIN" "0.1.0+1.20.0" \
     --no-input --no-converge-checks
   assert_success

tests/integration/app_deploy_overview.bats

@@ -37,10 +37,17 @@ teardown(){
     --no-input --no-converge-checks
   assert_success
 
-  assert_output --partial 'NEW DEPLOY OVERVIEW'
+  # current deployment
-  assert_output --partial 'CURRENT DEPLOYMENT    N/A'
+  assert_output --regexp 'VERSION.*N/A'
-  assert_output --partial 'ENV VERSION           N/A'
+  assert_output --regexp 'CHAOS.*false'
-  assert_output --partial "NEW DEPLOYMENT        ${latestRelease}"
+
+  # new deployment
+  assert_output --regexp 'VERSION.* ' + "${latestRelease}"
+  assert_output --regexp 'CHAOS.*false'
+
+  # env version
+  assert_output --regexp 'CURRENT VERSION.*N/A'
+  assert_output --regexp 'NEW VERSION.*' + "${latestRelease}"
 
   run grep -q "TYPE=$TEST_RECIPE:${latestRelease}" \
     "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
@@ -54,10 +61,17 @@ teardown(){
     --no-input --no-converge-checks
   assert_success
 
-  assert_output --partial 'NEW DEPLOY OVERVIEW'
+  # current deployment
-  assert_output --partial "CURRENT DEPLOYMENT    N/A"
+  assert_output --regexp 'VERSION.*N/A'
-  assert_output --partial "ENV VERSION           ${latestRelease}"
+  assert_output --regexp 'CHAOS.*false'
-  assert_output --partial "NEW DEPLOYMENT        ${latestRelease}"
+
+  # new deployment
+  assert_output --regexp 'VERSION.* ' + "${latestRelease}"
+  assert_output --regexp 'CHAOS.*false'
+
+  # env version
+  assert_output --regexp 'CURRENT VERSION.*' + "${latestRelease}"
+  assert_output --regexp 'NEW VERSION.*' + "${latestRelease}"
 
   run grep -q "TYPE=$TEST_RECIPE:${latestRelease}" \
     "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
@@ -76,10 +90,17 @@ teardown(){
     --no-input --no-converge-checks
   assert_success
 
-  assert_output --partial 'NEW DEPLOY OVERVIEW'
+  # current deployment
-  assert_output --partial "CURRENT DEPLOYMENT    N/A"
+  assert_output --regexp 'VERSION.*N/A'
-  assert_output --partial "ENV VERSION           0.1.1+1.20.2"
+  assert_output --regexp 'CHAOS.*false'
-  assert_output --partial "NEW DEPLOYMENT        0.1.1+1.20.2"
+
+  # new deployment
+  assert_output --regexp 'VERSION.*' + "0.1.1+1.20.2"
+  assert_output --regexp 'CHAOS.*false'
+
+  # env version
+  assert_output --regexp 'CURRENT VERSION.*' + "0.1.1+1.20.2"
+  assert_output --regexp 'NEW VERSION.*' + "0.1.1+1.20.2"
 
   run grep -q "TYPE=$TEST_RECIPE:0.1.1+1.20.2" \
     "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
@@ -99,10 +120,17 @@ teardown(){
     --no-input --no-converge-checks --ignore-env-version
   assert_success
 
-  assert_output --partial 'NEW DEPLOY OVERVIEW'
+  # current deployment
-  assert_output --partial "CURRENT DEPLOYMENT    N/A"
+  assert_output --regexp 'VERSION.*N/A'
-  assert_output --partial "ENV VERSION           0.1.1+1.20.2"
+  assert_output --regexp 'CHAOS.*false'
-  assert_output --partial "NEW DEPLOYMENT        ${latestRelease}"
+
+  # new deployment
+  assert_output --regexp 'VERSION.*' + "${latestRelease}"
+  assert_output --regexp 'CHAOS.*false'
+
+  # env version
+  assert_output --regexp 'CURRENT VERSION.*' + "0.1.1+1.20.2"
+  assert_output --regexp 'NEW VERSION.*' + "${latestRelease}"
 
   run grep -q "TYPE=$TEST_RECIPE:${latestRelease}" \
     "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
@@ -125,10 +153,17 @@ teardown(){
     --no-input --no-converge-checks --chaos
   assert_success
 
-  assert_output --partial 'CHAOS DEPLOY OVERVIEW'
+  # current deployment
-  assert_output --partial "CURRENT DEPLOYMENT    ${latestRelease}"
+  assert_output --regexp 'VERSION.*' + "${latestRelease}"
-  assert_output --partial "ENV VERSION           ${latestRelease}"
+  assert_output --regexp 'CHAOS.*false'
-  assert_output --partial "NEW DEPLOYMENT        ${headHash:0:8}+U"
+
+  # new deployment
+  assert_output --regexp 'VERSION.*' + "${latestRelease}"
+  assert_output --regexp 'CHAOS.*' + "${headHash:0:8}+U"
+
+  # env version
+  assert_output --regexp 'CURRENT VERSION.*' + "${latestRelease}"
+  assert_output --regexp 'NEW VERSION.*' + "${headHash:0:8}+U"
 
   run rm -rf "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
   assert_not_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
@@ -138,7 +173,7 @@ teardown(){
   assert_success
 }
 
-@test "can not redeploy chaos version without --chaos" {
+@test "chaos deploy then force deploy" {
   headHash=$(_get_head_hash)
   latestRelease=$(_latest_release)
 
@@ -154,12 +189,27 @@ teardown(){
   assert_not_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
 
   run $ABRA app deploy "$TEST_APP_DOMAIN" \
-    --no-input --no-converge-checks --force --debug
+    --no-input --no-converge-checks --force
-  assert_failure
+  assert_success
-  assert_output --regexp 'can not redeploy chaos version .*' + "${headHash:0:8}+U"
+
+  # current deployment
+  assert_output --regexp 'VERSION.*' + "${latestRelease}"
+  assert_output --regexp 'CHAOS.*' + "${headHash:0:8}+U"
+
+  # new deployment
+  assert_output --regexp 'VERSION.*' + "${latestRelease}"
+  assert_output --regexp 'CHAOS.*false'
+
+  # env version
+  assert_output --regexp 'CURRENT VERSION.*' + "${headHash:0:8}+U"
+  assert_output --regexp 'NEW VERSION.*' + "${latestRelease}"
+
+  run grep -q "TYPE=$TEST_RECIPE:${latestRelease}" \
+    "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
+  assert_success
 }
 
-@test "deploy then force commit deploy" {
+@test "deploy then force chaos commit deploy" {
   headHash=$(_get_head_hash)
   latestRelease=$(_latest_release)
 
@@ -175,10 +225,17 @@ teardown(){
     --no-input --no-converge-checks --force
   assert_success
 
-  assert_output --partial 'DEPLOY OVERVIEW'
+  # current deployment
-  assert_output --partial "CURRENT DEPLOYMENT    ${latestRelease}"
+  assert_output --regexp 'VERSION.*' + "${latestRelease}"
-  assert_output --partial "ENV VERSION           ${latestRelease}"
+  assert_output --regexp 'CHAOS.*false'
-  assert_output --partial "NEW DEPLOYMENT        ${headHash:0:8}"
+
+  # new deployment
+  assert_output --regexp 'VERSION.*' + "${latestRelease}"
+  assert_output --regexp 'CHAOS.*' + "${headHash:0:8}"
+
+  # env version
+  assert_output --regexp 'CURRENT VERSION.*' + "${latestRelease}"
+  assert_output --regexp 'NEW VERSION.*' + "${headHash:0:8}"
 
   run grep -q "TYPE=$TEST_RECIPE:${headHash:0:8}" \
     "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
@@ -193,10 +250,17 @@ teardown(){
     --no-input --no-converge-checks --chaos
   assert_success
 
-  assert_output --partial 'NEW DEPLOY OVERVIEW'
+  # current deployment
-  assert_output --partial "CURRENT DEPLOYMENT    N/A"
+  assert_output --regexp 'VERSION.*N/A'
-  assert_output --partial "ENV VERSION           ${latestRelease}"
+  assert_output --regexp 'CHAOS.*false'
-  assert_output --partial "NEW DEPLOYMENT        ${headHash:0:8}"
+
+  # new deployment
+  assert_output --regexp 'VERSION.*' + "${latestRelease}"
+  assert_output --regexp 'CHAOS.*' + "${headHash:0:8}"
+
+  # env version
+  assert_output --regexp 'CURRENT VERSION.*' + "${latestRelease}"
+  assert_output --regexp 'NEW VERSION.*' + "${headHash:0:8}"
 
   run bash -c 'echo "unstaged changes" >> "$ABRA_DIR/recipes/$TEST_RECIPE/foo"'
   assert_success
@@ -206,28 +270,17 @@ teardown(){
     --no-input --no-converge-checks --chaos
   assert_success
 
-  assert_output --partial 'CHAOS DEPLOY OVERVIEW'
+  # current deployment
-  assert_output --partial "CURRENT DEPLOYMENT    ${headHash:0:8}"
+  assert_output --regexp 'VERSION.*' + "${latestRelease}"
-  assert_output --partial "ENV VERSION           ${headHash:0:8}"
+  assert_output --regexp 'CHAOS.*' + "${headHash:0:8}"
-  assert_output --partial "NEW DEPLOYMENT        ${headHash:0:8}+U"
 
-  run $ABRA app deploy "$TEST_APP_DOMAIN" \
+  # new deployment
-    --no-input --no-converge-checks --chaos
+  assert_output --regexp 'VERSION.*' + "${latestRelease}"
-  assert_success
+  assert_output --regexp 'CHAOS.*' + "${headHash:0:8}+U"
 
-  assert_output --partial 'CHAOS DEPLOY OVERVIEW'
+  # env version
-  assert_output --partial "CURRENT DEPLOYMENT    ${headHash:0:8}+U"
+  assert_output --regexp 'CURRENT VERSION.*' + "${latestRelease}"
-  assert_output --partial "ENV VERSION           ${headHash:0:8}+U"
+  assert_output --regexp 'NEW VERSION.*' + "${headHash:0:8}+U"
-  assert_output --partial "NEW DEPLOYMENT        ${headHash:0:8}+U"
-
-  run $ABRA app deploy "$TEST_APP_DOMAIN" \
-    --no-input --no-converge-checks --chaos
-  assert_success
-
-  assert_output --partial 'CHAOS DEPLOY OVERVIEW'
-  assert_output --partial "CURRENT DEPLOYMENT    ${headHash:0:8}+U"
-  assert_output --partial "ENV VERSION           ${headHash:0:8}+U"
-  assert_output --partial "NEW DEPLOYMENT        ${headHash:0:8}+U"
 
   run grep -q "TYPE=$TEST_RECIPE:${headHash:0:8}" \
     "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
@@ -249,8 +302,19 @@ teardown(){
     --no-input --no-converge-checks --force
   assert_success
 
-  assert_output --partial 'REDEPLOY OVERVIEW'
+  # current deployment
-  assert_output --partial "CURRENT DEPLOYMENT    ${headHash:0:8}"
+  assert_output --regexp 'VERSION.*' + "${latestRelease}"
-  assert_output --partial "ENV VERSION           ${headHash:0:8}"
+  assert_output --regexp 'CHAOS.*' + "${headHash:0:8}"
-  assert_output --partial "NEW DEPLOYMENT        ${headHash:0:8}"
+
+  # new deployment
+  assert_output --regexp 'VERSION.*' + "${latestRelease}"
+  assert_output --regexp 'CHAOS.*false'
+
+  # env version
+  assert_output --regexp 'CURRENT VERSION.*' + "${headHash:0:8}"
+  assert_output --regexp 'NEW VERSION.*' + "${latestRelease}"
+
+  run grep -q "TYPE=$TEST_RECIPE:${latestRelease}" \
+    "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
+  assert_success
 }

tests/integration/app_list.bats

@@ -8,7 +8,6 @@ setup_file(){
 }
 
 teardown_file(){
-  _undeploy_app
   _rm_app
   _rm_server
 }
@@ -19,7 +18,6 @@ setup(){
 }
 
 teardown(){
-  _reset_recipe
   _undeploy_app
 }
 
@@ -89,10 +87,6 @@ teardown(){
   assert_success
   refute_output --partial "$TEST_RECIPE"
   assert_output --partial "foo-recipe"
-
-  run rm -rf "$ABRA_DIR/servers/foo.com"
-  assert_success
-  assert_not_exists "$ABRA_DIR/servers/foo.com"
 }
 
 @test "output is machine readable" {
@@ -104,36 +98,3 @@ teardown(){
 
   assert_output --partial "$expectedOutput"
 }
-
-# bats test_tags=slow
-@test "list with status fetches recipe" {
-  _deploy_app
-
-  run $ABRA app ls --status
-  assert_success
-
-  run rm -rf "$ABRA_DIR/recipes/$TEST_RECIPE"
-  assert_success
-
-  run $ABRA app ls --status
-  assert_success
-}
-
-# bats test_tags=slow
-@test "list with chaos version" {
-  run bash -c "echo foo >> $ABRA_DIR/recipes/$TEST_RECIPE/foo"
-  assert_success
-  assert_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
-
-  run $ABRA app deploy "$TEST_APP_DOMAIN" \
-    --no-input --no-converge-checks --chaos
-  assert_success
-
-  run $ABRA app ls --status
-  assert_success
-  assert_output --partial "+U"
-
-  run rm -rf "$ABRA_DIR/servers/foo.com"
-  assert_success
-  assert_not_exists "$ABRA_DIR/servers/foo.com"
-}

tests/integration/app_new.bats

@@ -214,7 +214,8 @@ teardown(){
     --chaos
   assert_success
   assert_exists "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
-  assert_output --partial "version: ${currentHash:0:8}+U"
+  assert_output --partial "version: ${currentHash:0:8}"
+  assert_output --partial "chaos: ${currentHash:0:8}"
 
   assert_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
   assert_equal "$(_git_status)" "?? foo"
@@ -241,7 +242,8 @@ teardown(){
     --chaos
   assert_success
   assert_exists "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
-  assert_output --partial "version: ${currentHash:0:8}+U"
+  assert_output --partial "version: ${currentHash:0:8}"
+  assert_output --partial "chaos: ${currentHash:0:8}"
 
   assert_exists "$ABRA_DIR/recipes/$TEST_RECIPE/foo"
   assert_equal "$(_git_status)" "?? foo"
@@ -250,10 +252,3 @@ teardown(){
     "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
   assert_success
 }
-
-@test "automatically select single server" {
-  # NOTE(d1): no --no-input required, single server available
-  run $ABRA app new "$TEST_RECIPE" --domain "$TEST_APP_DOMAIN"
-  assert_success
-  assert_exists "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
-}

tests/integration/app_rollback.bats

@@ -19,8 +19,8 @@ setup(){
 }
 
 teardown(){
-  _undeploy_app
   _reset_app
+  _undeploy_app
   _reset_recipe
 }
 
@@ -153,7 +153,7 @@ teardown(){
 }
 
 # bats test_tags=slow
-@test "rollback chaos deployment is not possible" {
+@test "rollback chaos deployment" {
   tagHash=$(_get_tag_hash "0.2.0+1.21.0")
   run git -C "$ABRA_DIR/recipes/$TEST_RECIPE" checkout "$tagHash"
   assert_success
@@ -163,8 +163,17 @@ teardown(){
   assert_output --partial "${tagHash:0:8}"
 
   run $ABRA app rollback "$TEST_APP_DOMAIN" "0.1.1+1.20.2" --no-input --no-converge-checks
-  assert_failure
+  assert_success
-  assert_output --partial 'current deployment' + "${tagHash:0:8}" + 'is not a known version'
+  assert_output --partial "0.1.1+1.20.2"
+  assert_output --partial "${tagHash:0:8}"
+
+  run $ABRA app rollback "$TEST_APP_DOMAIN" "0.1.0+1.20.0" --no-input --no-converge-checks
+  assert_success
+  assert_output --partial "0.1.0+1.20.0"
+
+  tagHash=$(_get_tag_hash "0.1.1+1.20.2")
+  refute_output --partial "${tagHash:0:8}"
+  assert_output --partial "false"
 }
 
 # bats test_tags=slow

tests/integration/app_rollback_overview.bats

@@ -33,10 +33,16 @@ teardown(){
     --no-input --no-converge-checks
   assert_success
 
-  assert_output --partial 'DOWNGRADE OVERVIEW'
+  # current deployment
-  assert_output --partial 'CURRENT DEPLOYMENT    0.2.0+1.21.0'
+  assert_output --regexp 'VERSION.*' + "0.2.0+1.21.0" 
-  assert_output --partial 'ENV VERSION           0.2.0+1.21.0'
+  assert_output --regexp 'CHAOS.*false'
-  assert_output --partial 'NEW DEPLOYMENT        0.1.0+1.20.0'
+
+  # rollback
+  assert_output --regexp 'VERSION.*' + "0.1.0+1.20.0" 
+
+  # env version
+  assert_output --regexp 'CURRENT VERSION.*' + "0.2.0+1.21.0"
+  assert_output --regexp 'NEW VERSION.*' + "0.1.0+1.20.0"
 
   run grep -q "TYPE=$TEST_RECIPE:0.1.0+1.20.0" \
     "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
@@ -52,10 +58,16 @@ teardown(){
     --no-input --no-converge-checks --force
   assert_success
 
-  assert_output --partial 'REDEPLOY OVERVIEW'
+  # current deployment
-  assert_output --partial 'CURRENT DEPLOYMENT    0.2.0+1.21.0'
+  assert_output --regexp 'VERSION.*' + "0.2.0+1.21.0" 
-  assert_output --partial 'ENV VERSION           0.2.0+1.21.0'
+  assert_output --regexp 'CHAOS.*false'
-  assert_output --partial 'NEW DEPLOYMENT        0.2.0+1.21.0'
+
+  # rollback
+  assert_output --regexp 'VERSION.*' + "0.2.0+1.21.0"
+
+  # env version
+  assert_output --regexp 'CURRENT VERSION.*' + "0.2.0+1.21.0"
+  assert_output --regexp 'NEW VERSION.*' + "0.2.0+1.21.0"
 
   run grep -q "TYPE=$TEST_RECIPE:0.2.0+1.21.0" \
     "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
@@ -73,10 +85,16 @@ teardown(){
     --no-input --no-converge-checks
   assert_success
 
-  assert_output --partial 'DOWNGRADE OVERVIEW'
+  # current deployment
-  assert_output --partial 'CURRENT DEPLOYMENT    0.2.0+1.21.0'
+  assert_output --regexp 'VERSION.*' + "0.2.0+1.21.0"
-  assert_output --partial 'ENV VERSION           N/A'
+  assert_output --regexp 'CHAOS.*false'
-  assert_output --partial 'NEW DEPLOYMENT        0.1.0+1.20.0'
+
+  # rollback
+  assert_output --regexp 'VERSION.*' + "0.1.0+1.20.0"
+
+  # env version
+  assert_output --regexp 'CURRENT VERSION.*N/A'
+  assert_output --regexp 'NEW VERSION.*' + "0.2.0+1.21.0"
 
   run grep -q "TYPE=$TEST_RECIPE:${latestRelease}" \
     "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"

tests/integration/app_undeploy.bats

@@ -92,6 +92,9 @@ teardown(){
 
   run $ABRA app undeploy "$TEST_APP_DOMAIN" --no-input
   assert_success
+
+  # NOTE(d1): ensure not chaos undeploy
+  assert_output --partial 'false'
 }
 
 # bats test_tags=slow

tests/integration/app_undeploy_overview.bats

@@ -33,10 +33,13 @@ teardown(){
   run $ABRA app undeploy "$TEST_APP_DOMAIN" --no-input
   assert_success
 
-  assert_output --partial 'UNDEPLOY OVERVIEW'
+  # current deployment
-  assert_output --partial 'CURRENT DEPLOYMENT    0.1.0+1.20.0'
+  assert_output --regexp 'VERSION.*' + "0.1.0+1.20.0" 
-  assert_output --partial 'ENV VERSION           0.1.0+1.20.0'
+  assert_output --regexp 'CHAOS.*false'
-  assert_output --partial 'NEW DEPLOYMENT        N/A'
+
+  # env version
+  assert_output --regexp 'CURRENT VERSION.*' + "0.1.0+1.20.0"
+  assert_output --regexp 'NEW VERSION.*' + "0.1.0+1.20.0"
 
   run grep -q "TYPE=$TEST_RECIPE:0.1.0+1.20.0" \
     "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
@@ -54,10 +57,13 @@ teardown(){
   run $ABRA app undeploy "$TEST_APP_DOMAIN" --no-input
   assert_success
 
-  assert_output --partial 'UNDEPLOY OVERVIEW'
+  # current deployment
-  assert_output --partial "CURRENT DEPLOYMENT    ${headHash:0:8}"
+  assert_output --regexp 'VERSION.*' + "${latestRelease}"
-  assert_output --partial "ENV VERSION           ${headHash:0:8}"
+  assert_output --regexp 'CHAOS.*' + "${headHash:0:8}"
-  assert_output --partial 'NEW DEPLOYMENT        N/A'
+
+  # env version
+  assert_output --regexp 'CURRENT VERSION.*' + "${latestRelease}"
+  assert_output --regexp 'NEW VERSION.*' + "${headHash:0:8}"
 
   run grep -q "TYPE=$TEST_RECIPE:${headHash:0:8}" \
     "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
@@ -66,6 +72,7 @@ teardown(){
 
 @test "chaos deploy with unstaged commits and undeploy" {
   headHash=$(_get_head_hash)
+  latestRelease=$(_latest_release)
 
   run bash -c 'echo "unstaged changes" >> "$ABRA_DIR/recipes/$TEST_RECIPE/foo"'
   assert_success
@@ -78,10 +85,13 @@ teardown(){
   run $ABRA app undeploy "$TEST_APP_DOMAIN" --no-input
   assert_success
 
-  assert_output --partial 'UNDEPLOY OVERVIEW'
+  # current deployment
-  assert_output --partial "CURRENT DEPLOYMENT    ${headHash:0:8}+U"
+  assert_output --regexp 'VERSION.*' + "${latestRelease}"
-  assert_output --partial "ENV VERSION           ${headHash:0:8}+U"
+  assert_output --regexp 'CHAOS.*' + "${headHash:0:8}+U"
-  assert_output --partial 'NEW DEPLOYMENT        N/A'
+
+  # env version
+  assert_output --regexp 'CURRENT VERSION.*' + "${latestRelease}"
+  assert_output --regexp 'NEW VERSION.*' + "${headHash:0:8}+U"
 
   run grep -q "TYPE=$TEST_RECIPE:${headHash:0:8}" \
     "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"

tests/integration/app_upgrade.bats

@@ -205,19 +205,7 @@ teardown(){
 }
 
 # bats test_tags=slow
-@test "show release note added after release" {
+@test "upgrade chaos deployment" {
-  run $ABRA app deploy "$TEST_APP_DOMAIN" "0.2.0+1.21.0" --no-input --no-converge-checks
-  assert_success
-  assert_output --partial '0.2.0+1.21.0'
-
-  run $ABRA app upgrade "$TEST_APP_DOMAIN" "0.3.0+1.21.0" --no-input --no-converge-checks
-  assert_success
-  assert_output --partial '0.3.0+1.21.0'
-  assert_output --partial 'A release note added after the release'
-}
-
-# bats test_tags=slow
-@test "upgrade commit deployment not possible" {
   tagHash=$(_get_tag_hash "0.1.0+1.20.0")
   run git -C "$ABRA_DIR/recipes/$TEST_RECIPE" checkout "$tagHash"
   assert_success
@@ -227,8 +215,17 @@ teardown(){
   assert_output --partial "${tagHash:0:8}"
 
   run $ABRA app upgrade "$TEST_APP_DOMAIN" "0.1.1+1.20.2" --no-input --no-converge-checks
-  assert_failure
+  assert_success
-  assert_output --partial "not a known version"
+  assert_output --partial "0.1.1+1.20.2"
+  assert_output --partial "${tagHash:0:8}"
+
+  run $ABRA app upgrade "$TEST_APP_DOMAIN" "0.2.0+1.21.0" --no-input --no-converge-checks
+  assert_success
+  assert_output --partial "0.2.0+1.21.0"
+
+  tagHash=$(_get_tag_hash "0.1.1+1.20.2")
+  refute_output --partial "${tagHash:0:8}"
+  assert_output --partial "false"
 }
 
 @test "chaos commit upgrade not possible" {

tests/integration/app_upgrade_overview.bats

@@ -31,10 +31,17 @@ teardown(){
     --no-input --no-converge-checks
   assert_success
 
-  assert_output --partial 'UPGRADE OVERVIEW'
+  # current deployment
-  assert_output --partial 'CURRENT DEPLOYMENT    0.1.0+1.20.0'
+  assert_output --regexp 'VERSION.*' + "0.1.0+1.20.0"
-  assert_output --partial 'ENV VERSION           0.1.0+1.20.0'
+  assert_output --regexp 'CHAOS.*false'
-  assert_output --partial 'NEW DEPLOYMENT        0.2.0+1.21.0'
+
+  # upgrade
+  assert_output --regexp 'VERSION.*' + "0.2.0+1.21.0" 
+  assert_output --regexp 'CHAOS.*false'
+
+  # env version
+  assert_output --regexp 'CURRENT VERSION.*' + "0.1.0+1.20.0"
+  assert_output --regexp 'NEW VERSION.*' + "0.2.0+1.21.0"
 
   run grep -q "TYPE=$TEST_RECIPE:0.2.0+1.21.0" \
     "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
@@ -50,10 +57,17 @@ teardown(){
     --no-input --no-converge-checks --force
   assert_success
 
-  assert_output --partial 'REDEPLOY OVERVIEW'
+  # current deployment
-  assert_output --partial 'CURRENT DEPLOYMENT    0.2.0+1.21.0'
+  assert_output --regexp 'VERSION.*' + "0.2.0+1.21.0" 
-  assert_output --partial 'ENV VERSION           0.2.0+1.21.0'
+  assert_output --regexp 'CHAOS.*false'
-  assert_output --partial 'NEW DEPLOYMENT        0.2.0+1.21.0'
+
+  # upgrade
+  assert_output --regexp 'VERSION.*' + "0.2.0+1.21.0"
+  assert_output --regexp 'CHAOS.*false'
+
+  # env version
+  assert_output --regexp 'CURRENT VERSION.*' + "0.2.0+1.21.0"
+  assert_output --regexp 'NEW VERSION.*' + "0.2.0+1.21.0"
 
   run grep -q "TYPE=$TEST_RECIPE:0.2.0+1.21.0" \
     "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"
@@ -73,10 +87,17 @@ teardown(){
     --no-input --no-converge-checks --force
   assert_success
 
-  assert_output --partial 'UPGRADE OVERVIEW'
+  # current deployment
-  assert_output --partial 'CURRENT DEPLOYMENT    0.2.0+1.21.0'
+  assert_output --regexp 'VERSION.*' + "0.2.0+1.21.0"
-  assert_output --partial 'ENV VERSION           N/A'
+  assert_output --regexp 'CHAOS.*false'
-  assert_output --partial 'NEW DEPLOYMENT        0.3.1+1.21.0'
+
+  # upgrade
+  assert_output --regexp 'VERSION.*' + "0.2.0+1.21.0"
+  assert_output --regexp 'CHAOS.*false'
+
+  # env version
+  assert_output --regexp 'CURRENT VERSION.*N/A'
+  assert_output --regexp 'NEW VERSION.*' + "0.2.0+1.21.0"
 
   run grep -q "TYPE=$TEST_RECIPE:${latestRelease}" \
     "$ABRA_DIR/servers/$TEST_SERVER/$TEST_APP_DOMAIN.env"

tests/integration/helpers/app.bash

@@ -30,15 +30,6 @@ _undeploy_app() {
   assert_output --partial 'unknown'
 }
 
-_undeploy_app2() {
-  run $ABRA app undeploy "$1" --no-input
-
-  run $ABRA app ls --server "$TEST_SERVER" --status
-  assert_success
-  assert_output --partial "$1"
-  assert_output --partial 'unknown'
-}
-
 _rm_app() {
   # NOTE(d1): not asserting outcomes on teardown here since some might fail
   # depending on what the test created. all commands run through anyway

tests/integration/helpers/git.bash

@@ -38,8 +38,6 @@ _set_git_author() {
 }
 
 _git_commit() {
-  _set_git_author
-
   run git -C "$ABRA_DIR/recipes/$TEST_RECIPE" add .
   assert_success
 

tests/integration/install.bats

@@ -25,3 +25,13 @@ teardown(){
   run "$HOME/.local/bin/abra" -v
   assert_output --partial 'beta'
 }
+
+# bats test_tags=slow
+@test "install release candidate from script" {
+  run bash -c 'curl https://install.abra.coopcloud.tech | bash -s -- --rc'
+  assert_success
+
+  assert_exists "$HOME/.local/bin/abra"
+  run "$HOME/.local/bin/abra" -v
+  assert_output --partial '-rc'
+}

tests/integration/recipe_fetch.bats

@@ -5,16 +5,6 @@ setup() {
   _common_setup
 }
 
-teardown(){
-  run rm -rf "$ABRA_DIR/recipes/matrix-synapse"
-  assert_success
-  assert_not_exists "$ABRA_DIR/recipes/$TEST_RECIPE"
-
-  run rm -rf "$ABRA_DIR/recipes/git_coopcloud_tech_coop-cloud_matrix-synapse"
-  assert_success
-  assert_not_exists "$ABRA_DIR/recipes/git_coopcloud_tech_coop-cloud_matrix-synapse"
-}
-
 # bats test_tags=slow
 @test "recipe fetch all" {
   run rm -rf "$ABRA_DIR/recipes/matrix-synapse"
@@ -45,81 +35,3 @@ teardown(){
   run $ABRA recipe fetch matrix-synapse --all
   assert_failure
 }
-
-@test "do not refetch without --force" {
-  run $ABRA recipe fetch matrix-synapse
-  assert_success
-  assert_exists "$ABRA_DIR/recipes/matrix-synapse"
-
-  run $ABRA recipe fetch matrix-synapse
-  assert_output --partial "already fetched"
-}
-
-@test "refetch with --force" {
-  run $ABRA recipe fetch matrix-synapse
-  assert_success
-  assert_exists "$ABRA_DIR/recipes/matrix-synapse"
-
-  run $ABRA recipe fetch matrix-synapse --force
-  assert_success
-  refute_output --partial "already fetched"
-}
-
-@test "refetch with --force does not erase unstaged changes" {
-  run $ABRA recipe fetch matrix-synapse
-  assert_success
-  assert_exists "$ABRA_DIR/recipes/matrix-synapse"
-
-  run bash -c "echo foo >> $ABRA_DIR/recipes/matrix-synapse/foo"
-  assert_success
-  assert_exists "$ABRA_DIR/recipes/matrix-synapse/foo"
-
-  run $ABRA recipe fetch matrix-synapse --force
-  assert_success
-  assert_exists "$ABRA_DIR/recipes/matrix-synapse"
-  assert_exists "$ABRA_DIR/recipes/matrix-synapse/foo"
-}
-
-@test "fetch with --ssh" {
-  run $ABRA recipe fetch matrix-synapse --ssh
-  assert_success
-  assert_exists "$ABRA_DIR/recipes/matrix-synapse"
-
-  run git -C "$ABRA_DIR/recipes/matrix-synapse" remote -v
-  assert_success
-  assert_output --partial "ssh://"
-}
-
-@test "re-fetch with --ssh/--force" {
-  run $ABRA recipe fetch matrix-synapse
-  assert_success
-  assert_exists "$ABRA_DIR/recipes/matrix-synapse"
-
-  run git -C "$ABRA_DIR/recipes/matrix-synapse" remote -v
-  assert_success
-  assert_output --partial "https://"
-
-  run $ABRA recipe fetch matrix-synapse --ssh --force
-  assert_success
-  assert_exists "$ABRA_DIR/recipes/matrix-synapse"
-
-  run git -C "$ABRA_DIR/recipes/matrix-synapse" remote -v
-  assert_success
-  assert_output --partial "ssh://"
-}
-
-@test "fetch remote recipe" {
-  run $ABRA recipe fetch git.coopcloud.tech/coop-cloud/matrix-synapse
-  assert_success
-  assert_exists "$ABRA_DIR/recipes/git_coopcloud_tech_coop-cloud_matrix-synapse"
-}
-
-@test "remote recipe do not refetch without --force" {
-  run $ABRA recipe fetch git.coopcloud.tech/coop-cloud/matrix-synapse
-  assert_success
-  assert_exists "$ABRA_DIR/recipes/git_coopcloud_tech_coop-cloud_matrix-synapse"
-
-  run $ABRA recipe fetch git.coopcloud.tech/coop-cloud/matrix-synapse
-  assert_success
-  assert_output --partial "already fetched"
-}

tests/integration/recipe_new.bats

@@ -68,27 +68,3 @@ teardown(){
   assert_output --partial 'fooUser'
   assert_output --partial 'foo@example.com'
 }
-
-# bats test_tags=slow
-@test "recipe new, app new, no releases, latest commit" {
-  recipeName="foobar"
-
-  run $ABRA recipe new "$recipeName"
-  assert_success
-  assert_exists "$ABRA_DIR/recipes/$recipeName"
-
-  currentHash=$(git -C "$ABRA_DIR/recipes/$recipeName" show -s --format="%H")
-  domain="$recipeName.$TEST_APP_SERVER" 
-
-  run $ABRA app new "$recipeName" \
-    --no-input \
-    --server "$TEST_SERVER" \
-    --domain "$domain"
-  assert_success
-  assert_output --partial "version: ${currentHash:0:8}"
-  assert_exists "$ABRA_DIR/servers/$TEST_SERVER/$domain.env"
-
-  run grep -q "TYPE=$recipeName:${currentHash:0:8}" \
-    "$ABRA_DIR/servers/$TEST_SERVER/$domain.env"
-  assert_success
-}

tests/integration/upgrade.bats

@@ -26,3 +26,14 @@ teardown(){
   run "$HOME/.local/bin/abra" -v
   assert_output --partial 'beta'
 }
+
+# bats test_tags=slow
+@test "abra upgrade release candidate" {
+  run $ABRA upgrade --rc
+  assert_success
+  assert_output --partial 'Public interest infrastructure'
+
+  assert_exists "$HOME/.local/bin/abra"
+  run "$HOME/.local/bin/abra" -v
+  assert_output --partial '-rc'
+}

vendor/github.com/ProtonMail/go-crypto/internal/byteutil/byteutil.go

@@ -49,16 +49,16 @@ func ShiftNBytesLeft(dst, x []byte, n int) {
 	dst = append(dst, make([]byte, n/8)...)
 }
 
-// XorBytesMut replaces X with X XOR Y. len(X) must be >= len(Y).
+// XorBytesMut assumes equal input length, replaces X with X XOR Y
 func XorBytesMut(X, Y []byte) {
-	for i := 0; i < len(Y); i++ {
+	for i := 0; i < len(X); i++ {
 		X[i] ^= Y[i]
 	}
 }
 
-// XorBytes puts X XOR Y into Z. len(Z) and len(X) must be >= len(Y).
+// XorBytes assumes equal input length, puts X XOR Y into Z
 func XorBytes(Z, X, Y []byte) {
-	for i := 0; i < len(Y); i++ {
+	for i := 0; i < len(X); i++ {
 		Z[i] = X[i] ^ Y[i]
 	}
 }

vendor/github.com/ProtonMail/go-crypto/ocb/ocb.go

@@ -109,10 +109,8 @@ func (o *ocb) Seal(dst, nonce, plaintext, adata []byte) []byte {
 	if len(nonce) > o.nonceSize {
 		panic("crypto/ocb: Incorrect nonce length given to OCB")
 	}
-	sep := len(plaintext)
+	ret, out := byteutil.SliceForAppend(dst, len(plaintext)+o.tagSize)
-	ret, out := byteutil.SliceForAppend(dst, sep+o.tagSize)
+	o.crypt(enc, out, nonce, adata, plaintext)
-	tag := o.crypt(enc, out[:sep], nonce, adata, plaintext)
-	copy(out[sep:], tag)
 	return ret
 }
 
@@ -124,10 +122,12 @@ func (o *ocb) Open(dst, nonce, ciphertext, adata []byte) ([]byte, error) {
 		return nil, ocbError("Ciphertext shorter than tag length")
 	}
 	sep := len(ciphertext) - o.tagSize
-	ret, out := byteutil.SliceForAppend(dst, sep)
+	ret, out := byteutil.SliceForAppend(dst, len(ciphertext))
 	ciphertextData := ciphertext[:sep]
-	tag := o.crypt(dec, out, nonce, adata, ciphertextData)
+	tag := ciphertext[sep:]
-	if subtle.ConstantTimeCompare(tag, ciphertext[sep:]) == 1 {
+	o.crypt(dec, out, nonce, adata, ciphertextData)
+	if subtle.ConstantTimeCompare(ret[sep:], tag) == 1 {
+		ret = ret[:sep]
 		return ret, nil
 	}
 	for i := range out {
@@ -137,8 +137,7 @@ func (o *ocb) Open(dst, nonce, ciphertext, adata []byte) ([]byte, error) {
 }
 
 // On instruction enc (resp. dec), crypt is the encrypt (resp. decrypt)
-// function. It writes the resulting plain/ciphertext into Y and returns
+// function. It returns the resulting plain/ciphertext with the tag appended.
-// the tag.
 func (o *ocb) crypt(instruction int, Y, nonce, adata, X []byte) []byte {
 	//
 	// Consider X as a sequence of 128-bit blocks
@@ -195,14 +194,13 @@ func (o *ocb) crypt(instruction int, Y, nonce, adata, X []byte) []byte {
 		byteutil.XorBytesMut(offset, o.mask.L[bits.TrailingZeros(uint(i+1))])
 		blockX := X[i*blockSize : (i+1)*blockSize]
 		blockY := Y[i*blockSize : (i+1)*blockSize]
+		byteutil.XorBytes(blockY, blockX, offset)
 		switch instruction {
 		case enc:
-			byteutil.XorBytesMut(checksum, blockX)
-			byteutil.XorBytes(blockY, blockX, offset)
 			o.block.Encrypt(blockY, blockY)
 			byteutil.XorBytesMut(blockY, offset)
+			byteutil.XorBytesMut(checksum, blockX)
 		case dec:
-			byteutil.XorBytes(blockY, blockX, offset)
 			o.block.Decrypt(blockY, blockY)
 			byteutil.XorBytesMut(blockY, offset)
 			byteutil.XorBytesMut(checksum, blockY)
@@ -218,24 +216,31 @@ func (o *ocb) crypt(instruction int, Y, nonce, adata, X []byte) []byte {
 		o.block.Encrypt(pad, offset)
 		chunkX := X[blockSize*m:]
 		chunkY := Y[blockSize*m : len(X)]
+		byteutil.XorBytes(chunkY, chunkX, pad[:len(chunkX)])
+		// P_* || bit(1) || zeroes(127) - len(P_*)
 		switch instruction {
 		case enc:
-			byteutil.XorBytesMut(checksum, chunkX)
+			paddedY := append(chunkX, byte(128))
-			checksum[len(chunkX)] ^= 128
+			paddedY = append(paddedY, make([]byte, blockSize-len(chunkX)-1)...)
-			byteutil.XorBytes(chunkY, chunkX, pad[:len(chunkX)])
+			byteutil.XorBytesMut(checksum, paddedY)
-			// P_* || bit(1) || zeroes(127) - len(P_*)
 		case dec:
-			byteutil.XorBytes(chunkY, chunkX, pad[:len(chunkX)])
+			paddedX := append(chunkY, byte(128))
-			// P_* || bit(1) || zeroes(127) - len(P_*)
+			paddedX = append(paddedX, make([]byte, blockSize-len(chunkY)-1)...)
-			byteutil.XorBytesMut(checksum, chunkY)
+			byteutil.XorBytesMut(checksum, paddedX)
-			checksum[len(chunkY)] ^= 128
-		}
 		}
 		byteutil.XorBytes(tag, checksum, offset)
 		byteutil.XorBytesMut(tag, o.mask.lDol)
 		o.block.Encrypt(tag, tag)
 		byteutil.XorBytesMut(tag, o.hash(adata))
-	return tag[:o.tagSize]
+		copy(Y[blockSize*m+len(chunkY):], tag[:o.tagSize])
+	} else {
+		byteutil.XorBytes(tag, checksum, offset)
+		byteutil.XorBytesMut(tag, o.mask.lDol)
+		o.block.Encrypt(tag, tag)
+		byteutil.XorBytesMut(tag, o.hash(adata))
+		copy(Y[blockSize*m:], tag[:o.tagSize])
+	}
+	return Y
 }
 
 // This hash function is used to compute the tag. Per design, on empty input it

vendor/github.com/ProtonMail/go-crypto/openpgp/armor/encode.go

@@ -7,7 +7,6 @@ package armor
 import (
 	"encoding/base64"
 	"io"
-	"sort"
 )
 
 var armorHeaderSep = []byte(": ")
@@ -160,15 +159,8 @@ func encode(out io.Writer, blockType string, headers map[string]string, checksum
 		return
 	}
 
-	keys := make([]string, len(headers))
+	for k, v := range headers {
-	i := 0
+		err = writeSlices(out, []byte(k), armorHeaderSep, []byte(v), newline)
-	for k := range headers {
-		keys[i] = k
-		i++
-	}
-	sort.Strings(keys)
-	for _, k := range keys {
-		err = writeSlices(out, []byte(k), armorHeaderSep, []byte(headers[k]), newline)
 		if err != nil {
 			return
 		}

vendor/github.com/ProtonMail/go-crypto/openpgp/errors/errors.go

@@ -6,7 +6,6 @@
 package errors // import "github.com/ProtonMail/go-crypto/openpgp/errors"
 
 import (
-	"fmt"
 	"strconv"
 )
 
@@ -179,22 +178,3 @@ type ErrMalformedMessage string
 func (dke ErrMalformedMessage) Error() string {
 	return "openpgp: malformed message " + string(dke)
 }
-
-// ErrEncryptionKeySelection is returned if encryption key selection fails (v2 API).
-type ErrEncryptionKeySelection struct {
-	PrimaryKeyId      string
-	PrimaryKeyErr     error
-	EncSelectionKeyId *string
-	EncSelectionErr   error
-}
-
-func (eks ErrEncryptionKeySelection) Error() string {
-	prefix := fmt.Sprintf("openpgp: key selection for primary key %s:", eks.PrimaryKeyId)
-	if eks.PrimaryKeyErr != nil {
-		return fmt.Sprintf("%s invalid primary key: %s", prefix, eks.PrimaryKeyErr)
-	}
-	if eks.EncSelectionKeyId != nil {
-		return fmt.Sprintf("%s invalid encryption key %s: %s", prefix, *eks.EncSelectionKeyId, eks.EncSelectionErr)
-	}
-	return fmt.Sprintf("%s no encryption key: %s", prefix, eks.EncSelectionErr)
-}

vendor/github.com/ProtonMail/go-crypto/openpgp/packet/aead_crypter.go

@@ -3,6 +3,7 @@
 package packet
 
 import (
+	"bytes"
 	"crypto/cipher"
 	"encoding/binary"
 	"io"
@@ -14,11 +15,12 @@ import (
 type aeadCrypter struct {
 	aead           cipher.AEAD
 	chunkSize      int
-	nonce          []byte
+	initialNonce   []byte
 	associatedData []byte       // Chunk-independent associated data
 	chunkIndex     []byte       // Chunk counter
 	packetTag      packetType   // SEIP packet (v2) or AEAD Encrypted Data packet
 	bytesProcessed int          // Amount of plaintext bytes encrypted/decrypted
+	buffer         bytes.Buffer // Buffered bytes across chunks
 }
 
 // computeNonce takes the incremental index and computes an eXclusive OR with
@@ -26,12 +28,12 @@ type aeadCrypter struct {
 // 5.16.1 and 5.16.2). It returns the resulting nonce.
 func (wo *aeadCrypter) computeNextNonce() (nonce []byte) {
 	if wo.packetTag == packetTypeSymmetricallyEncryptedIntegrityProtected {
-		return wo.nonce
+		return append(wo.initialNonce, wo.chunkIndex...)
 	}
 
-	nonce = make([]byte, len(wo.nonce))
+	nonce = make([]byte, len(wo.initialNonce))
-	copy(nonce, wo.nonce)
+	copy(nonce, wo.initialNonce)
-	offset := len(wo.nonce) - 8
+	offset := len(wo.initialNonce) - 8
 	for i := 0; i < 8; i++ {
 		nonce[i+offset] ^= wo.chunkIndex[i]
 	}
@@ -60,9 +62,8 @@ func (wo *aeadCrypter) incrementIndex() error {
 type aeadDecrypter struct {
 	aeadCrypter           // Embedded ciphertext opener
 	reader      io.Reader // 'reader' is a partialLengthReader
-	chunkBytes  []byte
 	peekedBytes []byte    // Used to detect last chunk
-	buffer      []byte    // Buffered decrypted bytes
+	eof         bool
 }
 
 // Read decrypts bytes and reads them into dst. It decrypts when necessary and
@@ -70,45 +71,60 @@ type aeadDecrypter struct {
 // and an error.
 func (ar *aeadDecrypter) Read(dst []byte) (n int, err error) {
 	// Return buffered plaintext bytes from previous calls
-	if len(ar.buffer) > 0 {
+	if ar.buffer.Len() > 0 {
-		n = copy(dst, ar.buffer)
+		return ar.buffer.Read(dst)
-		ar.buffer = ar.buffer[n:]
+	}
-		return
+
+	// Return EOF if we've previously validated the final tag
+	if ar.eof {
+		return 0, io.EOF
 	}
 
 	// Read a chunk
 	tagLen := ar.aead.Overhead()
-	copy(ar.chunkBytes, ar.peekedBytes) // Copy bytes peeked in previous chunk or in initialization
+	cipherChunkBuf := new(bytes.Buffer)
-	bytesRead, errRead := io.ReadFull(ar.reader, ar.chunkBytes[tagLen:])
+	_, errRead := io.CopyN(cipherChunkBuf, ar.reader, int64(ar.chunkSize+tagLen))
-	if errRead != nil && errRead != io.EOF && errRead != io.ErrUnexpectedEOF {
+	cipherChunk := cipherChunkBuf.Bytes()
+	if errRead != nil && errRead != io.EOF {
 		return 0, errRead
 	}
 
-	if bytesRead > 0 {
+	if len(cipherChunk) > 0 {
-		ar.peekedBytes = ar.chunkBytes[bytesRead:bytesRead+tagLen]
+		decrypted, errChunk := ar.openChunk(cipherChunk)
-
-		decrypted, errChunk := ar.openChunk(ar.chunkBytes[:bytesRead])
 		if errChunk != nil {
 			return 0, errChunk
 		}
 
 		// Return decrypted bytes, buffering if necessary
+		if len(dst) < len(decrypted) {
+			n = copy(dst, decrypted[:len(dst)])
+			ar.buffer.Write(decrypted[len(dst):])
+		} else {
 			n = copy(dst, decrypted)
-		ar.buffer = decrypted[n:]
+		}
+	}
+
+	// Check final authentication tag
+	if errRead == io.EOF {
+		errChunk := ar.validateFinalTag(ar.peekedBytes)
+		if errChunk != nil {
+			return n, errChunk
+		}
+		ar.eof = true // Mark EOF for when we've returned all buffered data
+	}
 	return
 }
 
-	return 0, io.EOF
+// Close is noOp. The final authentication tag of the stream was already
-}
+// checked in the last Read call. In the future, this function could be used to
-
+// wipe the reader and peeked, decrypted bytes, if necessary.
-// Close checks the final authentication tag of the stream.
-// In the future, this function could also be used to wipe the reader
-// and peeked & decrypted bytes, if necessary.
 func (ar *aeadDecrypter) Close() (err error) {
+	if !ar.eof {
 		errChunk := ar.validateFinalTag(ar.peekedBytes)
 		if errChunk != nil {
 			return errChunk
 		}
+	}
 	return nil
 }
 
@@ -116,13 +132,20 @@ func (ar *aeadDecrypter) Close() (err error) {
 // the underlying plaintext and an error. It accesses peeked bytes from next
 // chunk, to identify the last chunk and decrypt/validate accordingly.
 func (ar *aeadDecrypter) openChunk(data []byte) ([]byte, error) {
+	tagLen := ar.aead.Overhead()
+	// Restore carried bytes from last call
+	chunkExtra := append(ar.peekedBytes, data...)
+	// 'chunk' contains encrypted bytes, followed by an authentication tag.
+	chunk := chunkExtra[:len(chunkExtra)-tagLen]
+	ar.peekedBytes = chunkExtra[len(chunkExtra)-tagLen:]
+
 	adata := ar.associatedData
 	if ar.aeadCrypter.packetTag == packetTypeAEADEncrypted {
 		adata = append(ar.associatedData, ar.chunkIndex...)
 	}
 
 	nonce := ar.computeNextNonce()
-	plainChunk, err := ar.aead.Open(data[:0:len(data)], nonce, data, adata)
+	plainChunk, err := ar.aead.Open(nil, nonce, chunk, adata)
 	if err != nil {
 		return nil, errors.ErrAEADTagVerification
 	}
@@ -160,21 +183,21 @@ func (ar *aeadDecrypter) validateFinalTag(tag []byte) error {
 type aeadEncrypter struct {
 	aeadCrypter                // Embedded plaintext sealer
 	writer      io.WriteCloser // 'writer' is a partialLengthWriter
-	chunkBytes  []byte
-	offset      int
 }
 
 // Write encrypts and writes bytes. It encrypts when necessary and buffers extra
 // plaintext bytes for next call. When the stream is finished, Close() MUST be
 // called to append the final tag.
 func (aw *aeadEncrypter) Write(plaintextBytes []byte) (n int, err error) {
-	for n != len(plaintextBytes) {
+	// Append plaintextBytes to existing buffered bytes
-		copied := copy(aw.chunkBytes[aw.offset:aw.chunkSize], plaintextBytes[n:])
+	n, err = aw.buffer.Write(plaintextBytes)
-		n += copied
+	if err != nil {
-		aw.offset += copied
+		return n, err
-
+	}
-		if aw.offset == aw.chunkSize {
+	// Encrypt and write chunks
-			encryptedChunk, err := aw.sealChunk(aw.chunkBytes[:aw.offset])
+	for aw.buffer.Len() >= aw.chunkSize {
+		plainChunk := aw.buffer.Next(aw.chunkSize)
+		encryptedChunk, err := aw.sealChunk(plainChunk)
 		if err != nil {
 			return n, err
 		}
@@ -182,8 +205,6 @@ func (aw *aeadEncrypter) Write(plaintextBytes []byte) (n int, err error) {
 		if err != nil {
 			return n, err
 		}
-			aw.offset = 0
-		}
 	}
 	return
 }
@@ -194,8 +215,9 @@ func (aw *aeadEncrypter) Write(plaintextBytes []byte) (n int, err error) {
 func (aw *aeadEncrypter) Close() (err error) {
 	// Encrypt and write a chunk if there's buffered data left, or if we haven't
 	// written any chunks yet.
-	if aw.offset > 0 || aw.bytesProcessed == 0 {
+	if aw.buffer.Len() > 0 || aw.bytesProcessed == 0 {
-		lastEncryptedChunk, err := aw.sealChunk(aw.chunkBytes[:aw.offset])
+		plainChunk := aw.buffer.Bytes()
+		lastEncryptedChunk, err := aw.sealChunk(plainChunk)
 		if err != nil {
 			return err
 		}
@@ -241,7 +263,7 @@ func (aw *aeadEncrypter) sealChunk(data []byte) ([]byte, error) {
 	}
 
 	nonce := aw.computeNextNonce()
-	encrypted := aw.aead.Seal(data[:0], nonce, data, adata)
+	encrypted := aw.aead.Seal(nil, nonce, data, adata)
 	aw.bytesProcessed += len(data)
 	if err := aw.aeadCrypter.incrementIndex(); err != nil {
 		return nil, err

vendor/github.com/ProtonMail/go-crypto/openpgp/packet/aead_encrypted.go

@@ -65,28 +65,24 @@ func (ae *AEADEncrypted) decrypt(key []byte) (io.ReadCloser, error) {
 	blockCipher := ae.cipher.new(key)
 	aead := ae.mode.new(blockCipher)
 	// Carry the first tagLen bytes
-	chunkSize := decodeAEADChunkSize(ae.chunkSizeByte)
 	tagLen := ae.mode.TagLength()
-	chunkBytes := make([]byte, chunkSize+tagLen*2)
+	peekedBytes := make([]byte, tagLen)
-	peekedBytes := chunkBytes[chunkSize+tagLen:]
 	n, err := io.ReadFull(ae.Contents, peekedBytes)
 	if n < tagLen || (err != nil && err != io.EOF) {
 		return nil, errors.AEADError("Not enough data to decrypt:" + err.Error())
 	}
-
+	chunkSize := decodeAEADChunkSize(ae.chunkSizeByte)
 	return &aeadDecrypter{
 		aeadCrypter: aeadCrypter{
 			aead:           aead,
 			chunkSize:      chunkSize,
-			nonce:          ae.initialNonce,
+			initialNonce:   ae.initialNonce,
 			associatedData: ae.associatedData(),
 			chunkIndex:     make([]byte, 8),
 			packetTag:      packetTypeAEADEncrypted,
 		},
 		reader:      ae.Contents,
-		chunkBytes:  chunkBytes,
+		peekedBytes: peekedBytes}, nil
-		peekedBytes: peekedBytes,
-	}, nil
 }
 
 // associatedData for chunks: tag, version, cipher, mode, chunk size byte

vendor/github.com/ProtonMail/go-crypto/openpgp/packet/config.go

@@ -173,11 +173,6 @@ type Config struct {
 	// weaknesses in the hash algo, potentially hindering e.g. some chosen-prefix attacks.
 	// The default behavior, when the config or flag is nil, is to enable the feature.
 	NonDeterministicSignaturesViaNotation *bool
-
-	// InsecureAllowAllKeyFlagsWhenMissing determines how a key without valid key flags is handled.
-	// When set to true, a key without flags is treated as if all flags are enabled.
-	// This behavior is consistent with GPG.
-	InsecureAllowAllKeyFlagsWhenMissing bool
 }
 
 func (c *Config) Random() io.Reader {
@@ -408,13 +403,6 @@ func (c *Config) RandomizeSignaturesViaNotation() bool {
 	return *c.NonDeterministicSignaturesViaNotation
 }
 
-func (c *Config) AllowAllKeyFlagsWhenMissing() bool {
-	if c == nil {
-		return false
-	}
-	return c.InsecureAllowAllKeyFlagsWhenMissing
-}
-
 // BoolPointer is a helper function to set a boolean pointer in the Config.
 // e.g., config.CheckPacketSequence = BoolPointer(true)
 func BoolPointer(value bool) *bool {

vendor/github.com/ProtonMail/go-crypto/openpgp/packet/public_key.go

@@ -1048,17 +1048,12 @@ func (pk *PublicKey) VerifyDirectKeySignature(sig *Signature) (err error) {
 // KeyIdString returns the public key's fingerprint in capital hex
 // (e.g. "6C7EE1B8621CC013").
 func (pk *PublicKey) KeyIdString() string {
-	return fmt.Sprintf("%016X", pk.KeyId)
+	return fmt.Sprintf("%X", pk.Fingerprint[12:20])
 }
 
 // KeyIdShortString returns the short form of public key's fingerprint
 // in capital hex, as shown by gpg --list-keys (e.g. "621CC013").
-// This function will return the full key id for v5 and v6 keys
-// since the short key id is undefined for them.
 func (pk *PublicKey) KeyIdShortString() string {
-	if pk.Version >= 5 {
-		return pk.KeyIdString()
-	}
 	return fmt.Sprintf("%X", pk.Fingerprint[16:20])
 }
 

vendor/github.com/ProtonMail/go-crypto/openpgp/packet/signature.go

@@ -1288,9 +1288,7 @@ func (sig *Signature) buildSubpackets(issuer PublicKey) (subpackets []outputSubp
 	if sig.IssuerKeyId != nil && sig.Version == 4 {
 		keyId := make([]byte, 8)
 		binary.BigEndian.PutUint64(keyId, *sig.IssuerKeyId)
-		// Note: making this critical breaks RPM <=4.16.
+		subpackets = append(subpackets, outputSubpacket{true, issuerSubpacket, true, keyId})
-		// See: https://github.com/ProtonMail/go-crypto/issues/263
-		subpackets = append(subpackets, outputSubpacket{true, issuerSubpacket, false, keyId})
 	}
 	// Notation Data
 	for _, notation := range sig.Notations {

vendor/github.com/ProtonMail/go-crypto/openpgp/packet/symmetrically_encrypted_aead.go

@@ -70,10 +70,8 @@ func (se *SymmetricallyEncrypted) decryptAead(inputKey []byte) (io.ReadCloser, e
 
 	aead, nonce := getSymmetricallyEncryptedAeadInstance(se.Cipher, se.Mode, inputKey, se.Salt[:], se.associatedData())
 	// Carry the first tagLen bytes
-	chunkSize := decodeAEADChunkSize(se.ChunkSizeByte)
 	tagLen := se.Mode.TagLength()
-	chunkBytes := make([]byte, chunkSize+tagLen*2)
+	peekedBytes := make([]byte, tagLen)
-	peekedBytes := chunkBytes[chunkSize+tagLen:]
 	n, err := io.ReadFull(se.Contents, peekedBytes)
 	if n < tagLen || (err != nil && err != io.EOF) {
 		return nil, errors.StructuralError("not enough data to decrypt:" + err.Error())
@@ -83,13 +81,12 @@ func (se *SymmetricallyEncrypted) decryptAead(inputKey []byte) (io.ReadCloser, e
 		aeadCrypter: aeadCrypter{
 			aead:           aead,
 			chunkSize:      decodeAEADChunkSize(se.ChunkSizeByte),
-			nonce:          nonce,
+			initialNonce:   nonce,
 			associatedData: se.associatedData(),
-			chunkIndex:     nonce[len(nonce)-8:],
+			chunkIndex:     make([]byte, 8),
 			packetTag:      packetTypeSymmetricallyEncryptedIntegrityProtected,
 		},
 		reader:      se.Contents,
-		chunkBytes:  chunkBytes,
 		peekedBytes: peekedBytes,
 	}, nil
 }
@@ -133,20 +130,16 @@ func serializeSymmetricallyEncryptedAead(ciphertext io.WriteCloser, cipherSuite
 
 	aead, nonce := getSymmetricallyEncryptedAeadInstance(cipherSuite.Cipher, cipherSuite.Mode, inputKey, salt, prefix)
 
-	chunkSize := decodeAEADChunkSize(chunkSizeByte)
-	tagLen := aead.Overhead()
-	chunkBytes := make([]byte, chunkSize+tagLen)
 	return &aeadEncrypter{
 		aeadCrypter: aeadCrypter{
 			aead:           aead,
-			chunkSize:      chunkSize,
+			chunkSize:      decodeAEADChunkSize(chunkSizeByte),
 			associatedData: prefix,
-			nonce:          nonce,
+			chunkIndex:     make([]byte, 8),
-			chunkIndex:     nonce[len(nonce)-8:],
+			initialNonce:   nonce,
 			packetTag:      packetTypeSymmetricallyEncryptedIntegrityProtected,
 		},
 		writer: ciphertext,
-		chunkBytes: chunkBytes,
 	}, nil
 }
 
@@ -156,10 +149,10 @@ func getSymmetricallyEncryptedAeadInstance(c CipherFunction, mode AEADMode, inpu
 	encryptionKey := make([]byte, c.KeySize())
 	_, _ = readFull(hkdfReader, encryptionKey)
 
-	nonce = make([]byte, mode.IvLength())
-
 	// Last 64 bits of nonce are the counter
-	_, _ = readFull(hkdfReader, nonce[:len(nonce)-8])
+	nonce = make([]byte, mode.IvLength()-8)
+
+	_, _ = readFull(hkdfReader, nonce)
 
 	blockCipher := c.new(encryptionKey)
 	aead = mode.new(blockCipher)

vendor/github.com/charmbracelet/bubbletea/README.md

@@ -17,8 +17,9 @@ complex terminal applications, either inline, full-window, or a mix of both.
 </p>
 
 Bubble Tea is in use in production and includes a number of features and
-performance optimizations we’ve added along the way. Among those is
+performance optimizations we’ve added along the way. Among those is a standard
-a framerate-based renderer, mouse support, focus reporting and more.
+framerate-based renderer, a renderer for high-performance scrollable
+regions which works alongside the main renderer, and mouse support.
 
 To get started, see the tutorial below, the [examples][examples], the
 [docs][docs], the [video tutorials][youtube] and some common [resources](#libraries-we-use-with-bubble-tea).
@@ -48,7 +49,7 @@ By the way, the non-annotated source code for this program is available
 [on GitHub][tut-source].
 
 [elm]: https://guide.elm-lang.org/architecture/
-[tut-source]: https://github.com/charmbracelet/bubbletea/tree/main/tutorials/basics
+[tut-source]: https://github.com/charmbracelet/bubbletea/tree/master/tutorials/basics
 
 ### Enough! Let's get to it.
 
@@ -60,10 +61,6 @@ import will be the Bubble Tea library, which we'll call `tea` for short.
 ```go
 package main
 
-// These imports will be used later on the tutorial. If you save the file
-// now, Go might complain they are unused, but that's fine.
-// You may also need to run `go mod tidy` to download bubbletea and its
-// dependencies.
 import (
     "fmt"
     "os"
@@ -257,8 +254,8 @@ look at the [Command Tutorial][cmd]. It's pretty simple.
 There are also several [Bubble Tea examples][examples] available and, of course,
 there are [Go Docs][docs].
 
-[cmd]: https://github.com/charmbracelet/bubbletea/tree/main/tutorials/commands/
+[cmd]: https://github.com/charmbracelet/bubbletea/tree/master/tutorials/commands/
-[examples]: https://github.com/charmbracelet/bubbletea/tree/main/examples
+[examples]: https://github.com/charmbracelet/bubbletea/tree/master/examples
 [docs]: https://pkg.go.dev/github.com/charmbracelet/bubbletea?tab=doc
 
 ## Debugging
@@ -313,16 +310,20 @@ your program in another window.
 - [Harmonica][harmonica]: A spring animation library for smooth, natural motion
 - [BubbleZone][bubblezone]: Easy mouse event tracking for Bubble Tea components
 - [ntcharts][ntcharts]: A terminal charting library built for Bubble Tea and [Lip Gloss][lipgloss]
+- [Termenv][termenv]: Advanced ANSI styling for terminal applications
+- [Reflow][reflow]: Advanced ANSI-aware methods for working with text
 
 [bubbles]: https://github.com/charmbracelet/bubbles
 [lipgloss]: https://github.com/charmbracelet/lipgloss
 [harmonica]: https://github.com/charmbracelet/harmonica
 [bubblezone]: https://github.com/lrstanley/bubblezone
 [ntcharts]: https://github.com/NimbleMarkets/ntcharts
+[termenv]: https://github.com/muesli/termenv
+[reflow]: https://github.com/muesli/reflow
 
 ## Bubble Tea in the Wild
 
-There are over [10,000 applications](https://github.com/charmbracelet/bubbletea/network/dependents) built with Bubble Tea! Here are a handful of ’em.
+There are over 8k applications built with Bubble Tea! Here are a handful of ’em.
 
 ### Staff favourites
 
@@ -330,19 +331,15 @@ There are over [10,000 applications](https://github.com/charmbracelet/bubbletea/
 - [circumflex](https://github.com/bensadeh/circumflex): read Hacker News in the terminal
 - [gh-dash](https://www.github.com/dlvhdr/gh-dash): a GitHub CLI extension for PRs and issues
 - [Tetrigo](https://github.com/Broderick-Westrope/tetrigo): Tetris in the terminal
-- [Signls](https://github.com/emprcl/signls): a generative midi sequencer designed for composition and live performance
-- [Superfile](https://github.com/yorukot/superfile): a super file manager
 
 ### In Industry
 
 - Microsoft Azure – [Aztify](https://github.com/Azure/aztfy): bring Microsoft Azure resources under Terraform
 - Daytona – [Daytona](https://github.com/daytonaio/daytona): open source dev environment manager
-- Cockroach Labs – [CockroachDB](https://github.com/cockroachdb/cockroach): a cloud-native, high-availability distributed SQL database
 - Truffle Security Co. – [Trufflehog](https://github.com/trufflesecurity/trufflehog): find leaked credentials
-- NVIDIA – [container-canary](https://github.com/NVIDIA/container-canary): a container validator
+- NVIDIA – [container-canary](https://github.com/NVIDIA/container-canary) from NVIDIA: a container validator
-- AWS – [eks-node-viewer](https://github.com/awslabs/eks-node-viewer): a tool for visualizing dynamic node usage within an EKS cluster
+- AWS – [eks-node-viewer](https://github.com/awslabs/eks-node-viewer) from AWS: a tool for visualizing dynamic node usage within an EKS cluster
-- MinIO – [mc](https://github.com/minio/mc): the official [MinIO](https://min.io) client
+- MinIO – [mc](https://github.com/minio/mc) from Min.io: the official [MinIO](https://min.io) client
-- Ubuntu – [Authd](https://github.com/ubuntu/authd): an authentication daemon for cloud-based identity providers
 
 ### Charm stuff
 
@@ -385,7 +382,7 @@ of days past.
 
 ## License
 
-[MIT](https://github.com/charmbracelet/bubbletea/raw/main/LICENSE)
+[MIT](https://github.com/charmbracelet/bubbletea/raw/master/LICENSE)
 
 ---
 

vendor/github.com/charmbracelet/bubbletea/inputreader_other.go

@@ -9,6 +9,6 @@ import (
 	"github.com/muesli/cancelreader"
 )
 
-func newInputReader(r io.Reader, _ bool) (cancelreader.CancelReader, error) {
+func newInputReader(r io.Reader) (cancelreader.CancelReader, error) {
 	return cancelreader.NewReader(r)
 }

vendor/github.com/charmbracelet/bubbletea/inputreader_windows.go

@@ -25,7 +25,7 @@ type conInputReader struct {
 
 var _ cancelreader.CancelReader = &conInputReader{}
 
-func newInputReader(r io.Reader, enableMouse bool) (cancelreader.CancelReader, error) {
+func newInputReader(r io.Reader) (cancelreader.CancelReader, error) {
 	fallback := func(io.Reader) (cancelreader.CancelReader, error) {
 		return cancelreader.NewReader(r)
 	}
@@ -38,21 +38,11 @@ func newInputReader(r io.Reader, enableMouse bool) (cancelreader.CancelReader, e
 		return fallback(r)
 	}
 
-	modes := []uint32{
+	originalMode, err := prepareConsole(conin,
+		windows.ENABLE_MOUSE_INPUT,
 		windows.ENABLE_WINDOW_INPUT,
 		windows.ENABLE_EXTENDED_FLAGS,
-	}
+	)
-
-	// Since we have options to enable mouse events, [WithMouseCellMotion],
-	// [WithMouseAllMotion], and [EnableMouseCellMotion],
-	// [EnableMouseAllMotion], and [DisableMouse], we need to check if the user
-	// has enabled mouse events and add the appropriate mode accordingly.
-	// Otherwise, mouse events will be enabled all the time.
-	if enableMouse {
-		modes = append(modes, windows.ENABLE_MOUSE_INPUT)
-	}
-
-	originalMode, err := prepareConsole(conin, modes...)
 	if err != nil {
 		return nil, fmt.Errorf("failed to prepare console input: %w", err)
 	}
@@ -67,7 +57,7 @@ func newInputReader(r io.Reader, enableMouse bool) (cancelreader.CancelReader, e
 func (r *conInputReader) Cancel() bool {
 	r.setCanceled()
 
-	return windows.CancelIoEx(r.conin, nil) == nil || windows.CancelIo(r.conin) == nil
+	return windows.CancelIo(r.conin) == nil
 }
 
 // Close implements cancelreader.CancelReader.
@@ -83,11 +73,8 @@ func (r *conInputReader) Close() error {
 }
 
 // Read implements cancelreader.CancelReader.
-func (r *conInputReader) Read(_ []byte) (n int, err error) {
+func (*conInputReader) Read(_ []byte) (n int, err error) {
-	if r.isCanceled() {
+	return 0, nil
-		err = cancelreader.ErrCanceled
-	}
-	return
 }
 
 func prepareConsole(input windows.Handle, modes ...uint32) (originalMode uint32, err error) {
@@ -118,10 +105,3 @@ func (c *cancelMixin) setCanceled() {
 
 	c.unsafeCanceled = true
 }
-
-func (c *cancelMixin) isCanceled() bool {
-	c.lock.Lock()
-	defer c.lock.Unlock()
-
-	return c.unsafeCanceled
-}

vendor/github.com/charmbracelet/bubbletea/key_windows.go

@@ -10,26 +10,23 @@ import (
 
 	"github.com/erikgeiser/coninput"
 	localereader "github.com/mattn/go-localereader"
-	"github.com/muesli/cancelreader"
+	"golang.org/x/sys/windows"
 )
 
 func readInputs(ctx context.Context, msgs chan<- Msg, input io.Reader) error {
 	if coninReader, ok := input.(*conInputReader); ok {
-		return readConInputs(ctx, msgs, coninReader)
+		return readConInputs(ctx, msgs, coninReader.conin)
 	}
 
 	return readAnsiInputs(ctx, msgs, localereader.NewReader(input))
 }
 
-func readConInputs(ctx context.Context, msgsch chan<- Msg, con *conInputReader) error {
+func readConInputs(ctx context.Context, msgsch chan<- Msg, con windows.Handle) error {
 	var ps coninput.ButtonState                 // keep track of previous mouse state
 	var ws coninput.WindowBufferSizeEventRecord // keep track of the last window size event
 	for {
-		events, err := coninput.ReadNConsoleInputs(con.conin, 16)
+		events, err := coninput.ReadNConsoleInputs(con, 16)
 		if err != nil {
-			if con.isCanceled() {
-				return cancelreader.ErrCanceled
-			}
 			return fmt.Errorf("read coninput events: %w", err)
 		}
 
@@ -277,11 +274,7 @@ func keyType(e coninput.KeyEventRecord) KeyType {
 	case coninput.VK_DELETE:
 		return KeyDelete
 	default:
-		switch {
+		if e.ControlKeyState&(coninput.LEFT_CTRL_PRESSED|coninput.RIGHT_CTRL_PRESSED) == 0 {
-		case e.ControlKeyState.Contains(coninput.LEFT_CTRL_PRESSED) && e.ControlKeyState.Contains(coninput.RIGHT_ALT_PRESSED):
-			// AltGr is pressed, then it's a rune.
-			fallthrough
-		case !e.ControlKeyState.Contains(coninput.LEFT_CTRL_PRESSED) && !e.ControlKeyState.Contains(coninput.RIGHT_CTRL_PRESSED):
 			return KeyRunes
 		}
 
@@ -341,7 +334,7 @@ func keyType(e coninput.KeyEventRecord) KeyType {
 		case '\x1a':
 			return KeyCtrlZ
 		case '\x1b':
-			return KeyCtrlOpenBracket // KeyEscape
+			return KeyCtrlCloseBracket
 		case '\x1c':
 			return KeyCtrlBackslash
 		case '\x1f':
@@ -351,8 +344,6 @@ func keyType(e coninput.KeyEventRecord) KeyType {
 		switch code {
 		case coninput.VK_OEM_4:
 			return KeyCtrlOpenBracket
-		case coninput.VK_OEM_6:
-			return KeyCtrlCloseBracket
 		}
 
 		return KeyRunes

vendor/github.com/charmbracelet/bubbletea/options.go

@@ -186,7 +186,7 @@ func WithoutRenderer() ProgramOption {
 // This feature is provisional, and may be changed or removed in a future version
 // of this package.
 //
-// Deprecated: this incurs a noticeable performance hit. A future release will
+// Deprecated: this incurs a noticable performance hit. A future release will
 // optimize ANSI automatically without the performance penalty.
 func WithANSICompressor() ProgramOption {
 	return func(p *Program) {

vendor/github.com/charmbracelet/bubbletea/standard_renderer.go

@@ -172,7 +172,7 @@ func (r *standardRenderer) flush() {
 
 	// Moving to the beginning of the section, that we rendered.
 	if r.altScreenActive {
-		buf.WriteString(ansi.CursorHomePosition)
+		buf.WriteString(ansi.HomeCursorPosition)
 	} else if r.linesRendered > 1 {
 		buf.WriteString(ansi.CursorUp(r.linesRendered - 1))
 	}
@@ -217,7 +217,7 @@ func (r *standardRenderer) flush() {
 		if _, ignore := r.ignoreLines[i]; ignore || canSkip {
 			// Unless this is the last line, move the cursor down.
 			if i < len(newLines)-1 {
-				buf.WriteByte('\n')
+				buf.WriteString(ansi.CursorDown1)
 			}
 			continue
 		}
@@ -258,8 +258,13 @@ func (r *standardRenderer) flush() {
 		}
 	}
 
+	lastLinesRendered := r.linesRendered
+	if r.altScreenActive {
+		lastLinesRendered = r.altLinesRendered
+	}
+
 	// Clearing left over content from last render.
-	if r.lastLinesRendered() > len(newLines) {
+	if lastLinesRendered > len(newLines) {
 		buf.WriteString(ansi.EraseScreenBelow)
 	}
 
@@ -275,9 +280,9 @@ func (r *standardRenderer) flush() {
 		// This case fixes a bug in macOS terminal. In other terminals the
 		// other case seems to do the job regardless of whether or not we're
 		// using the full terminal window.
-		buf.WriteString(ansi.CursorPosition(0, len(newLines)))
+		buf.WriteString(ansi.SetCursorPosition(0, len(newLines)))
 	} else {
-		buf.WriteString(ansi.CursorBackward(r.width))
+		buf.WriteString(ansi.CursorLeft(r.width))
 	}
 
 	_, _ = r.out.Write(buf.Bytes())
@@ -290,14 +295,6 @@ func (r *standardRenderer) flush() {
 	r.buf.Reset()
 }
 
-// lastLinesRendered returns the number of lines rendered lastly.
-func (r *standardRenderer) lastLinesRendered() int {
-	if r.altScreenActive {
-		return r.altLinesRendered
-	}
-	return r.linesRendered
-}
-
 // write writes to the internal buffer. The buffer will be outputted via the
 // ticker which calls flush().
 func (r *standardRenderer) write(s string) {
@@ -326,7 +323,7 @@ func (r *standardRenderer) clearScreen() {
 	defer r.mtx.Unlock()
 
 	r.execute(ansi.EraseEntireScreen)
-	r.execute(ansi.CursorHomePosition)
+	r.execute(ansi.HomeCursorPosition)
 
 	r.repaint()
 }
@@ -347,7 +344,7 @@ func (r *standardRenderer) enterAltScreen() {
 	}
 
 	r.altScreenActive = true
-	r.execute(ansi.SetAltScreenSaveCursorMode)
+	r.execute(ansi.EnableAltScreenBuffer)
 
 	// Ensure that the terminal is cleared, even when it doesn't support
 	// alt screen (or alt screen support is disabled, like GNU screen by
@@ -356,7 +353,7 @@ func (r *standardRenderer) enterAltScreen() {
 	// Note: we can't use r.clearScreen() here because the mutex is already
 	// locked.
 	r.execute(ansi.EraseEntireScreen)
-	r.execute(ansi.CursorHomePosition)
+	r.execute(ansi.HomeCursorPosition)
 
 	// cmd.exe and other terminals keep separate cursor states for the AltScreen
 	// and the main buffer. We have to explicitly reset the cursor visibility
@@ -382,7 +379,7 @@ func (r *standardRenderer) exitAltScreen() {
 	}
 
 	r.altScreenActive = false
-	r.execute(ansi.ResetAltScreenSaveCursorMode)
+	r.execute(ansi.DisableAltScreenBuffer)
 
 	// cmd.exe and other terminals keep separate cursor states for the AltScreen
 	// and the main buffer. We have to explicitly reset the cursor visibility
@@ -416,49 +413,49 @@ func (r *standardRenderer) enableMouseCellMotion() {
 	r.mtx.Lock()
 	defer r.mtx.Unlock()
 
-	r.execute(ansi.SetButtonEventMouseMode)
+	r.execute(ansi.EnableMouseCellMotion)
 }
 
 func (r *standardRenderer) disableMouseCellMotion() {
 	r.mtx.Lock()
 	defer r.mtx.Unlock()
 
-	r.execute(ansi.ResetButtonEventMouseMode)
+	r.execute(ansi.DisableMouseCellMotion)
 }
 
 func (r *standardRenderer) enableMouseAllMotion() {
 	r.mtx.Lock()
 	defer r.mtx.Unlock()
 
-	r.execute(ansi.SetAnyEventMouseMode)
+	r.execute(ansi.EnableMouseAllMotion)
 }
 
 func (r *standardRenderer) disableMouseAllMotion() {
 	r.mtx.Lock()
 	defer r.mtx.Unlock()
 
-	r.execute(ansi.ResetAnyEventMouseMode)
+	r.execute(ansi.DisableMouseAllMotion)
 }
 
 func (r *standardRenderer) enableMouseSGRMode() {
 	r.mtx.Lock()
 	defer r.mtx.Unlock()
 
-	r.execute(ansi.SetSgrExtMouseMode)
+	r.execute(ansi.EnableMouseSgrExt)
 }
 
 func (r *standardRenderer) disableMouseSGRMode() {
 	r.mtx.Lock()
 	defer r.mtx.Unlock()
 
-	r.execute(ansi.ResetSgrExtMouseMode)
+	r.execute(ansi.DisableMouseSgrExt)
 }
 
 func (r *standardRenderer) enableBracketedPaste() {
 	r.mtx.Lock()
 	defer r.mtx.Unlock()
 
-	r.execute(ansi.SetBracketedPasteMode)
+	r.execute(ansi.EnableBracketedPaste)
 	r.bpActive = true
 }
 
@@ -466,7 +463,7 @@ func (r *standardRenderer) disableBracketedPaste() {
 	r.mtx.Lock()
 	defer r.mtx.Unlock()
 
-	r.execute(ansi.ResetBracketedPasteMode)
+	r.execute(ansi.DisableBracketedPaste)
 	r.bpActive = false
 }
 
@@ -481,7 +478,7 @@ func (r *standardRenderer) enableReportFocus() {
 	r.mtx.Lock()
 	defer r.mtx.Unlock()
 
-	r.execute(ansi.SetFocusEventMode)
+	r.execute(ansi.EnableReportFocus)
 	r.reportingFocus = true
 }
 
@@ -489,7 +486,7 @@ func (r *standardRenderer) disableReportFocus() {
 	r.mtx.Lock()
 	defer r.mtx.Unlock()
 
-	r.execute(ansi.ResetFocusEventMode)
+	r.execute(ansi.DisableReportFocus)
 	r.reportingFocus = false
 }
 
@@ -510,7 +507,7 @@ func (r *standardRenderer) setWindowTitle(title string) {
 func (r *standardRenderer) setIgnoredLines(from int, to int) {
 	// Lock if we're going to be clearing some lines since we don't want
 	// anything jacking our cursor.
-	if r.lastLinesRendered() > 0 {
+	if r.linesRendered > 0 {
 		r.mtx.Lock()
 		defer r.mtx.Unlock()
 	}
@@ -523,17 +520,16 @@ func (r *standardRenderer) setIgnoredLines(from int, to int) {
 	}
 
 	// Erase ignored lines
-	lastLinesRendered := r.lastLinesRendered()
+	if r.linesRendered > 0 {
-	if lastLinesRendered > 0 {
 		buf := &bytes.Buffer{}
 
-		for i := lastLinesRendered - 1; i >= 0; i-- {
+		for i := r.linesRendered - 1; i >= 0; i-- {
 			if _, exists := r.ignoreLines[i]; exists {
 				buf.WriteString(ansi.EraseEntireLine)
 			}
-			buf.WriteString(ansi.CUU1)
+			buf.WriteString(ansi.CursorUp1)
 		}
-		buf.WriteString(ansi.CursorPosition(0, lastLinesRendered)) // put cursor back
+		buf.WriteString(ansi.SetCursorPosition(0, r.linesRendered)) // put cursor back
 		_, _ = r.out.Write(buf.Bytes())
 	}
 }
@@ -572,14 +568,14 @@ func (r *standardRenderer) insertTop(lines []string, topBoundary, bottomBoundary
 
 	buf := &bytes.Buffer{}
 
-	buf.WriteString(ansi.SetTopBottomMargins(topBoundary, bottomBoundary))
+	buf.WriteString(ansi.SetScrollingRegion(topBoundary, bottomBoundary))
-	buf.WriteString(ansi.CursorPosition(0, topBoundary))
+	buf.WriteString(ansi.SetCursorPosition(0, topBoundary))
 	buf.WriteString(ansi.InsertLine(len(lines)))
 	_, _ = buf.WriteString(strings.Join(lines, "\r\n"))
-	buf.WriteString(ansi.SetTopBottomMargins(0, r.height))
+	buf.WriteString(ansi.SetScrollingRegion(0, r.height))
 
 	// Move cursor back to where the main rendering routine expects it to be
-	buf.WriteString(ansi.CursorPosition(0, r.lastLinesRendered()))
+	buf.WriteString(ansi.SetCursorPosition(0, r.linesRendered))
 
 	_, _ = r.out.Write(buf.Bytes())
 }
@@ -602,13 +598,13 @@ func (r *standardRenderer) insertBottom(lines []string, topBoundary, bottomBound
 
 	buf := &bytes.Buffer{}
 
-	buf.WriteString(ansi.SetTopBottomMargins(topBoundary, bottomBoundary))
+	buf.WriteString(ansi.SetScrollingRegion(topBoundary, bottomBoundary))
-	buf.WriteString(ansi.CursorPosition(0, bottomBoundary))
+	buf.WriteString(ansi.SetCursorPosition(0, bottomBoundary))
 	_, _ = buf.WriteString("\r\n" + strings.Join(lines, "\r\n"))
-	buf.WriteString(ansi.SetTopBottomMargins(0, r.height))
+	buf.WriteString(ansi.SetScrollingRegion(0, r.height))
 
 	// Move cursor back to where the main rendering routine expects it to be
-	buf.WriteString(ansi.CursorPosition(0, r.lastLinesRendered()))
+	buf.WriteString(ansi.SetCursorPosition(0, r.linesRendered))
 
 	_, _ = r.out.Write(buf.Bytes())
 }

vendor/github.com/charmbracelet/bubbletea/tea.go

@@ -16,7 +16,6 @@ import (
 	"io"
 	"os"
 	"os/signal"
-	"runtime"
 	"runtime/debug"
 	"sync"
 	"sync/atomic"
@@ -27,13 +26,9 @@ import (
 	"golang.org/x/sync/errgroup"
 )
 
-// ErrProgramKilled is returned by [Program.Run] when the program gets killed.
+// ErrProgramKilled is returned by [Program.Run] when the program got killed.
 var ErrProgramKilled = errors.New("program was killed")
 
-// ErrInterrupted is returned by [Program.Run] when the program get a SIGINT
-// signal, or when it receives a [InterruptMsg].
-var ErrInterrupted = errors.New("program was interrupted")
-
 // Msg contain data from the result of a IO operation. Msgs trigger the update
 // function and, henceforth, the UI.
 type Msg interface{}
@@ -184,9 +179,6 @@ type Program struct {
 	// fps is the frames per second we should set on the renderer, if
 	// applicable,
 	fps int
-
-	// mouseMode is true if the program should enable mouse mode on Windows.
-	mouseMode bool
 }
 
 // Quit is a special command that tells the Bubble Tea program to exit.
@@ -194,8 +186,8 @@ func Quit() Msg {
 	return QuitMsg{}
 }
 
-// QuitMsg signals that the program should quit. You can send a [QuitMsg] with
+// QuitMsg signals that the program should quit. You can send a QuitMsg with
-// [Quit].
+// Quit.
 type QuitMsg struct{}
 
 // Suspend is a special command that tells the Bubble Tea program to suspend.
@@ -207,28 +199,13 @@ func Suspend() Msg {
 // This usually happens when ctrl+z is pressed on common programs, but since
 // bubbletea puts the terminal in raw mode, we need to handle it in a
 // per-program basis.
-//
+// You can send this message with Suspend.
-// You can send this message with [Suspend()].
 type SuspendMsg struct{}
 
 // ResumeMsg can be listen to to do something once a program is resumed back
 // from a suspend state.
 type ResumeMsg struct{}
 
-// InterruptMsg signals the program should suspend.
-// This usually happens when ctrl+c is pressed on common programs, but since
-// bubbletea puts the terminal in raw mode, we need to handle it in a
-// per-program basis.
-//
-// You can send this message with [Interrupt()].
-type InterruptMsg struct{}
-
-// Interrupt is a special command that tells the Bubble Tea program to
-// interrupt.
-func Interrupt() Msg {
-	return InterruptMsg{}
-}
-
 // NewProgram creates a new Program.
 func NewProgram(model Model, opts ...ProgramOption) *Program {
 	p := &Program{
@@ -286,14 +263,9 @@ func (p *Program) handleSignals() chan struct{} {
 			case <-p.ctx.Done():
 				return
 
-			case s := <-sig:
+			case <-sig:
 				if atomic.LoadUint32(&p.ignoreSignals) == 0 {
-					switch s {
-					case syscall.SIGINT:
-						p.msgs <- InterruptMsg{}
-					default:
 					p.msgs <- QuitMsg{}
-					}
 					return
 				}
 			}
@@ -390,9 +362,6 @@ func (p *Program) eventLoop(model Model, cmds chan Cmd) (Model, error) {
 			case QuitMsg:
 				return model, nil
 
-			case InterruptMsg:
-				return model, ErrInterrupted
-
 			case SuspendMsg:
 				if suspendSupported {
 					p.suspend()
@@ -417,25 +386,9 @@ func (p *Program) eventLoop(model Model, cmds chan Cmd) (Model, error) {
 				// mouse mode (1006) is a no-op if the terminal doesn't support it.
 				p.renderer.enableMouseSGRMode()
 
-				// XXX: This is used to enable mouse mode on Windows. We need
-				// to reinitialize the cancel reader to get the mouse events to
-				// work.
-				if runtime.GOOS == "windows" && !p.mouseMode {
-					p.mouseMode = true
-					p.initCancelReader(true) //nolint:errcheck
-				}
-
 			case disableMouseMsg:
 				p.disableMouse()
 
-				// XXX: On Windows, mouse mode is enabled on the input reader
-				// level. We need to instruct the input reader to stop reading
-				// mouse events.
-				if runtime.GOOS == "windows" && p.mouseMode {
-					p.mouseMode = false
-					p.initCancelReader(true) //nolint:errcheck
-				}
-
 			case showCursorMsg:
 				p.renderer.showCursor()
 
@@ -599,11 +552,6 @@ func (p *Program) Run() (Model, error) {
 		p.renderer.enableMouseAllMotion()
 		p.renderer.enableMouseSGRMode()
 	}
-
-	// XXX: Should we enable mouse mode on Windows?
-	// This needs to happen before initializing the cancel and input reader.
-	p.mouseMode = p.startupOptions&withMouseCellMotion != 0 || p.startupOptions&withMouseAllMotion != 0
-
 	if p.startupOptions&withReportFocus != 0 {
 		p.renderer.enableReportFocus()
 	}
@@ -632,7 +580,7 @@ func (p *Program) Run() (Model, error) {
 
 	// Subscribe to user input.
 	if p.input != nil {
-		if err := p.initCancelReader(false); err != nil {
+		if err := p.initCancelReader(); err != nil {
 			return model, err
 		}
 	}
@@ -645,11 +593,10 @@ func (p *Program) Run() (Model, error) {
 
 	// Run event loop, handle updates and draw.
 	model, err := p.eventLoop(model, cmds)
-	killed := p.ctx.Err() != nil || err != nil
+	killed := p.ctx.Err() != nil
-	if killed && err == nil {
+	if killed {
 		err = fmt.Errorf("%w: %s", ErrProgramKilled, p.ctx.Err())
-	}
+	} else {
-	if err == nil {
 		// Ensure we rendered the final state of the model.
 		p.renderer.write(model.View())
 	}
@@ -788,7 +735,7 @@ func (p *Program) RestoreTerminal() error {
 	if err := p.initTerminal(); err != nil {
 		return err
 	}
-	if err := p.initCancelReader(false); err != nil {
+	if err := p.initCancelReader(); err != nil {
 		return err
 	}
 	if p.altScreenWasActive {

vendor/github.com/charmbracelet/bubbletea/tty.go

@@ -75,14 +75,9 @@ func (p *Program) restoreInput() error {
 }
 
 // initCancelReader (re)commences reading inputs.
-func (p *Program) initCancelReader(cancel bool) error {
+func (p *Program) initCancelReader() error {
-	if cancel && p.cancelReader != nil {
-		p.cancelReader.Cancel()
-		p.waitForReadLoop()
-	}
-
 	var err error
-	p.cancelReader, err = newInputReader(p.input, p.mouseMode)
+	p.cancelReader, err = newInputReader(p.input)
 	if err != nil {
 		return fmt.Errorf("error creating cancelreader: %w", err)
 	}

vendor/github.com/charmbracelet/colorprofile/.golangci.yml

@@ -1,28 +0,0 @@
-run:
-  tests: false
-
-issues:
-  include:
-    - EXC0001
-    - EXC0005
-    - EXC0011
-    - EXC0012
-    - EXC0013
-
-  max-issues-per-linter: 0
-  max-same-issues: 0
-
-linters:
-  enable:
-    - bodyclose
-    - gofumpt
-    - goimports
-    - gosec
-    - nilerr
-    - revive
-    - rowserrcheck
-    - sqlclosecheck
-    - tparallel
-    - unconvert
-    - unparam
-    - whitespace

vendor/github.com/charmbracelet/colorprofile/.goreleaser.yml

@@ -1,6 +0,0 @@
-includes:
-  - from_url:
-      url: charmbracelet/meta/main/goreleaser-lib.yaml
-
-# yaml-language-server: $schema=https://goreleaser.com/static/schema-pro.json
-

vendor/github.com/charmbracelet/colorprofile/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2020-2024 Charmbracelet, Inc
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

vendor/github.com/charmbracelet/colorprofile/README.md

@@ -1,103 +0,0 @@
-# Colorprofile
-
-<p>
-    <a href="https://github.com/charmbracelet/colorprofile/releases"><img src="https://img.shields.io/github/release/charmbracelet/colorprofile.svg" alt="Latest Release"></a>
-    <a href="https://pkg.go.dev/github.com/charmbracelet/colorprofile?tab=doc"><img src="https://godoc.org/github.com/charmbracelet/colorprofile?status.svg" alt="GoDoc"></a>
-    <a href="https://github.com/charmbracelet/colorprofile/actions"><img src="https://github.com/charmbracelet/colorprofile/actions/workflows/build.yml/badge.svg" alt="Build Status"></a>
-</p>
-
-A simple, powerful—and at times magical—package for detecting terminal color
-profiles and performing color (and CSI) degradation.
-
-## Detecting the terminal’s color profile
-
-Detecting the terminal’s color profile is easy.
-
-```go
-import "github.com/charmbracelet/colorprofile"
-
-// Detect the color profile. If you’re planning on writing to stderr you'd want
-// to use os.Stderr instead.
-p := colorprofile.Detect(os.Stdout, os.Environ())
-
-// Comment on the profile.
-fmt.Printf("You know, your colors are quite %s.", func() string {
-    switch p {
-    case colorprofile.TrueColor:
-        return "fancy"
-    case colorprofile.ANSI256:
-        return "1990s fancy"
-    case colorprofile.ANSI:
-        return "normcore"
-    case colorprofile.Ascii:
-        return "ancient"
-    case colorprofile.NoTTY:
-        return "naughty!"
-    }
-    return "...IDK" // this should never happen
-}())
-```
-
-## Downsampling colors
-
-When necessary, colors can be downsampled to a given profile, or manually
-downsampled to a specific profile.
-
-```go
-p := colorprofile.Detect(os.Stdout, os.Environ())
-c := color.RGBA{0x6b, 0x50, 0xff, 0xff} // #6b50ff
-
-// Downsample to the detected profile, when necessary.
-convertedColor := p.Convert(c)
-
-// Or manually convert to a given profile.
-ansi256Color := colorprofile.ANSI256.Convert(c)
-ansiColor := colorprofile.ANSI.Convert(c)
-noColor := colorprofile.Ascii.Convert(c)
-noANSI := colorprofile.NoTTY.Convert(c)
-```
-
-## Automatic downsampling with a Writer
-
-You can also magically downsample colors in ANSI output, when necessary. If
-output is not a TTY ANSI will be dropped entirely.
-
-```go
-myFancyANSI := "\x1b[38;2;107;80;255mCute \x1b[1;3mpuppy!!\x1b[m"
-
-// Automatically downsample for the terminal at stdout.
-w := colorprofile.NewWriter(os.Stdout, os.Environ())
-fmt.Fprintf(w, myFancyANSI)
-
-// Downsample to 4-bit ANSI.
-w.Profile = colorprofile.ANSI
-fmt.Fprintf(w, myFancyANSI)
-
-// Ascii-fy, no colors.
-w.Profile = colorprofile.Ascii
-fmt.Fprintf(w, myFancyANSI)
-
-// Strip ANSI altogether.
-w.Profile = colorprofile.NoTTY
-fmt.Fprintf(w, myFancyANSI) // not as fancy
-```
-
-## Feedback
-
-We’d love to hear your thoughts on this project. Feel free to drop us a note!
-
-- [Twitter](https://twitter.com/charmcli)
-- [The Fediverse](https://mastodon.social/@charmcli)
-- [Discord](https://charm.sh/chat)
-
-## License
-
-[MIT](https://github.com/charmbracelet/bubbletea/raw/master/LICENSE)
-
----
-
-Part of [Charm](https://charm.sh).
-
-<a href="https://charm.sh/"><img alt="The Charm logo" src="https://stuff.charm.sh/charm-badge.jpg" width="400"></a>
-
-Charm热爱开源 • Charm loves open source • نحنُ نحب المصادر المفتوحة

vendor/github.com/charmbracelet/colorprofile/env.go

@@ -1,287 +0,0 @@
-package colorprofile
-
-import (
-	"bytes"
-	"io"
-	"os/exec"
-	"runtime"
-	"strconv"
-	"strings"
-
-	"github.com/charmbracelet/x/term"
-	"github.com/xo/terminfo"
-)
-
-// Detect returns the color profile based on the terminal output, and
-// environment variables. This respects NO_COLOR, CLICOLOR, and CLICOLOR_FORCE
-// environment variables.
-//
-// The rules as follows:
-//   - TERM=dumb is always treated as NoTTY unless CLICOLOR_FORCE=1 is set.
-//   - If COLORTERM=truecolor, and the profile is not NoTTY, it gest upgraded to TrueColor.
-//   - Using any 256 color terminal (e.g. TERM=xterm-256color) will set the profile to ANSI256.
-//   - Using any color terminal (e.g. TERM=xterm-color) will set the profile to ANSI.
-//   - Using CLICOLOR=1 without TERM defined should be treated as ANSI if the
-//     output is a terminal.
-//   - NO_COLOR takes precedence over CLICOLOR/CLICOLOR_FORCE, and will disable
-//     colors but not text decoration, i.e. bold, italic, faint, etc.
-//
-// See https://no-color.org/ and https://bixense.com/clicolors/ for more information.
-func Detect(output io.Writer, env []string) Profile {
-	out, ok := output.(term.File)
-	isatty := ok && term.IsTerminal(out.Fd())
-	environ := newEnviron(env)
-	term := environ.get("TERM")
-	isDumb := term == "dumb"
-	envp := colorProfile(isatty, environ)
-	if envp == TrueColor || envNoColor(environ) {
-		// We already know we have TrueColor, or NO_COLOR is set.
-		return envp
-	}
-
-	if isatty && !isDumb {
-		tip := Terminfo(term)
-		tmuxp := tmux(environ)
-
-		// Color profile is the maximum of env, terminfo, and tmux.
-		return max(envp, max(tip, tmuxp))
-	}
-
-	return envp
-}
-
-// Env returns the color profile based on the terminal environment variables.
-// This respects NO_COLOR, CLICOLOR, and CLICOLOR_FORCE environment variables.
-//
-// The rules as follows:
-//   - TERM=dumb is always treated as NoTTY unless CLICOLOR_FORCE=1 is set.
-//   - If COLORTERM=truecolor, and the profile is not NoTTY, it gest upgraded to TrueColor.
-//   - Using any 256 color terminal (e.g. TERM=xterm-256color) will set the profile to ANSI256.
-//   - Using any color terminal (e.g. TERM=xterm-color) will set the profile to ANSI.
-//   - Using CLICOLOR=1 without TERM defined should be treated as ANSI if the
-//     output is a terminal.
-//   - NO_COLOR takes precedence over CLICOLOR/CLICOLOR_FORCE, and will disable
-//     colors but not text decoration, i.e. bold, italic, faint, etc.
-//
-// See https://no-color.org/ and https://bixense.com/clicolors/ for more information.
-func Env(env []string) (p Profile) {
-	return colorProfile(true, newEnviron(env))
-}
-
-func colorProfile(isatty bool, env environ) (p Profile) {
-	isDumb := env.get("TERM") == "dumb"
-	envp := envColorProfile(env)
-	if !isatty || isDumb {
-		// Check if the output is a terminal.
-		// Treat dumb terminals as NoTTY
-		p = NoTTY
-	} else {
-		p = envp
-	}
-
-	if envNoColor(env) && isatty {
-		if p > Ascii {
-			p = Ascii
-		}
-		return
-	}
-
-	if cliColorForced(env) {
-		if p < ANSI {
-			p = ANSI
-		}
-		if envp > p {
-			p = envp
-		}
-
-		return
-	}
-
-	if cliColor(env) {
-		if isatty && !isDumb && p < ANSI {
-			p = ANSI
-		}
-	}
-
-	return p
-}
-
-// envNoColor returns true if the environment variables explicitly disable color output
-// by setting NO_COLOR (https://no-color.org/).
-func envNoColor(env environ) bool {
-	noColor, _ := strconv.ParseBool(env.get("NO_COLOR"))
-	return noColor
-}
-
-func cliColor(env environ) bool {
-	cliColor, _ := strconv.ParseBool(env.get("CLICOLOR"))
-	return cliColor
-}
-
-func cliColorForced(env environ) bool {
-	cliColorForce, _ := strconv.ParseBool(env.get("CLICOLOR_FORCE"))
-	return cliColorForce
-}
-
-func colorTerm(env environ) bool {
-	colorTerm := strings.ToLower(env.get("COLORTERM"))
-	return colorTerm == "truecolor" || colorTerm == "24bit" ||
-		colorTerm == "yes" || colorTerm == "true"
-}
-
-// envColorProfile returns infers the color profile from the environment.
-func envColorProfile(env environ) (p Profile) {
-	term, ok := env.lookup("TERM")
-	if !ok || len(term) == 0 || term == "dumb" {
-		p = NoTTY
-		if runtime.GOOS == "windows" {
-			// Use Windows API to detect color profile. Windows Terminal and
-			// cmd.exe don't define $TERM.
-			if wcp, ok := windowsColorProfile(env); ok {
-				p = wcp
-			}
-		}
-	} else {
-		p = ANSI
-	}
-
-	parts := strings.Split(term, "-")
-	switch parts[0] {
-	case "alacritty",
-		"contour",
-		"foot",
-		"ghostty",
-		"kitty",
-		"rio",
-		"st",
-		"wezterm":
-		return TrueColor
-	case "xterm":
-		if len(parts) > 1 {
-			switch parts[1] {
-			case "ghostty", "kitty":
-				// These terminals can be defined as xterm-TERMNAME
-				return TrueColor
-			}
-		}
-	case "tmux", "screen":
-		if p < ANSI256 {
-			p = ANSI256
-		}
-	}
-
-	if isCloudShell, _ := strconv.ParseBool(env.get("GOOGLE_CLOUD_SHELL")); isCloudShell {
-		return TrueColor
-	}
-
-	// GNU Screen doesn't support TrueColor
-	// Tmux doesn't support $COLORTERM
-	if colorTerm(env) && !strings.HasPrefix(term, "screen") && !strings.HasPrefix(term, "tmux") {
-		return TrueColor
-	}
-
-	if strings.HasSuffix(term, "256color") && p < ANSI256 {
-		p = ANSI256
-	}
-
-	return
-}
-
-// Terminfo returns the color profile based on the terminal's terminfo
-// database. This relies on the Tc and RGB capabilities to determine if the
-// terminal supports TrueColor.
-// If term is empty or "dumb", it returns NoTTY.
-func Terminfo(term string) (p Profile) {
-	if len(term) == 0 || term == "dumb" {
-		return NoTTY
-	}
-
-	p = ANSI
-	ti, err := terminfo.Load(term)
-	if err != nil {
-		return
-	}
-
-	extbools := ti.ExtBoolCapsShort()
-	if _, ok := extbools["Tc"]; ok {
-		return TrueColor
-	}
-
-	if _, ok := extbools["RGB"]; ok {
-		return TrueColor
-	}
-
-	return
-}
-
-// Tmux returns the color profile based on `tmux info` output. Tmux supports
-// overriding the terminal's color capabilities, so this function will return
-// the color profile based on the tmux configuration.
-func Tmux(env []string) Profile {
-	return tmux(newEnviron(env))
-}
-
-// tmux returns the color profile based on the tmux environment variables.
-func tmux(env environ) (p Profile) {
-	if tmux, ok := env.lookup("TMUX"); !ok || len(tmux) == 0 {
-		// Not in tmux
-		return NoTTY
-	}
-
-	// Check if tmux has either Tc or RGB capabilities. Otherwise, return
-	// ANSI256.
-	p = ANSI256
-	cmd := exec.Command("tmux", "info")
-	out, err := cmd.Output()
-	if err != nil {
-		return
-	}
-
-	for _, line := range bytes.Split(out, []byte("\n")) {
-		if (bytes.Contains(line, []byte("Tc")) || bytes.Contains(line, []byte("RGB"))) &&
-			bytes.Contains(line, []byte("true")) {
-			return TrueColor
-		}
-	}
-
-	return
-}
-
-// environ is a map of environment variables.
-type environ map[string]string
-
-// newEnviron returns a new environment map from a slice of environment
-// variables.
-func newEnviron(environ []string) environ {
-	m := make(map[string]string, len(environ))
-	for _, e := range environ {
-		parts := strings.SplitN(e, "=", 2)
-		var value string
-		if len(parts) == 2 {
-			value = parts[1]
-		}
-		m[parts[0]] = value
-	}
-	return m
-}
-
-// lookup returns the value of an environment variable and a boolean indicating
-// if it exists.
-func (e environ) lookup(key string) (string, bool) {
-	v, ok := e[key]
-	return v, ok
-}
-
-// get returns the value of an environment variable and empty string if it
-// doesn't exist.
-func (e environ) get(key string) string {
-	v, _ := e.lookup(key)
-	return v
-}
-
-func max[T ~byte | ~int](a, b T) T {
-	if a > b {
-		return a
-	}
-	return b
-}

vendor/github.com/charmbracelet/colorprofile/env_other.go

@@ -1,8 +0,0 @@
-//go:build !windows
-// +build !windows
-
-package colorprofile
-
-func windowsColorProfile(map[string]string) (Profile, bool) {
-	return 0, false
-}

vendor/github.com/charmbracelet/colorprofile/env_windows.go

@@ -1,45 +0,0 @@
-//go:build windows
-// +build windows
-
-package colorprofile
-
-import (
-	"strconv"
-
-	"golang.org/x/sys/windows"
-)
-
-func windowsColorProfile(env map[string]string) (Profile, bool) {
-	if env["ConEmuANSI"] == "ON" {
-		return TrueColor, true
-	}
-
-	if len(env["WT_SESSION"]) > 0 {
-		// Windows Terminal supports TrueColor
-		return TrueColor, true
-	}
-
-	major, _, build := windows.RtlGetNtVersionNumbers()
-	if build < 10586 || major < 10 {
-		// No ANSI support before WindowsNT 10 build 10586
-		if len(env["ANSICON"]) > 0 {
-			ansiconVer := env["ANSICON_VER"]
-			cv, err := strconv.Atoi(ansiconVer)
-			if err != nil || cv < 181 {
-				// No 8 bit color support before ANSICON 1.81
-				return ANSI, true
-			}
-
-			return ANSI256, true
-		}
-
-		return NoTTY, true
-	}
-
-	if build < 14931 {
-		// No true color support before build 14931
-		return ANSI256, true
-	}
-
-	return TrueColor, true
-}

vendor/github.com/charmbracelet/colorprofile/profile.go

@@ -1,399 +0,0 @@
-package colorprofile
-
-import (
-	"image/color"
-	"math"
-
-	"github.com/charmbracelet/x/ansi"
-	"github.com/lucasb-eyer/go-colorful"
-)
-
-// Profile is a color profile: NoTTY, Ascii, ANSI, ANSI256, or TrueColor.
-type Profile byte
-
-const (
-	// NoTTY, not a terminal profile.
-	NoTTY Profile = iota
-	// Ascii, uncolored profile.
-	Ascii //nolint:revive
-	// ANSI, 4-bit color profile.
-	ANSI
-	// ANSI256, 8-bit color profile.
-	ANSI256
-	// TrueColor, 24-bit color profile.
-	TrueColor
-)
-
-// String returns the string representation of a Profile.
-func (p Profile) String() string {
-	switch p {
-	case TrueColor:
-		return "TrueColor"
-	case ANSI256:
-		return "ANSI256"
-	case ANSI:
-		return "ANSI"
-	case Ascii:
-		return "Ascii"
-	case NoTTY:
-		return "NoTTY"
-	}
-	return "Unknown"
-}
-
-// Convert transforms a given Color to a Color supported within the Profile.
-func (p Profile) Convert(c color.Color) color.Color {
-	if p <= Ascii {
-		return nil
-	}
-
-	switch c := c.(type) {
-	case ansi.BasicColor:
-		return c
-
-	case ansi.ExtendedColor:
-		if p == ANSI {
-			return ansi256ToANSIColor(c)
-		}
-		return c
-
-	case ansi.TrueColor, color.Color:
-		h, ok := colorful.MakeColor(c)
-		if !ok {
-			return nil
-		}
-		if p != TrueColor {
-			ac := hexToANSI256Color(h)
-			if p == ANSI {
-				return ansi256ToANSIColor(ac)
-			}
-			return ac
-		}
-		return c
-	}
-
-	return c
-}
-
-func hexToANSI256Color(c colorful.Color) ansi.ExtendedColor {
-	v2ci := func(v float64) int {
-		if v < 48 {
-			return 0
-		}
-		if v < 115 {
-			return 1
-		}
-		return int((v - 35) / 40)
-	}
-
-	// Calculate the nearest 0-based color index at 16..231
-	r := v2ci(c.R * 255.0) // 0..5 each
-	g := v2ci(c.G * 255.0)
-	b := v2ci(c.B * 255.0)
-	ci := 36*r + 6*g + b /* 0..215 */
-
-	// Calculate the represented colors back from the index
-	i2cv := [6]int{0, 0x5f, 0x87, 0xaf, 0xd7, 0xff}
-	cr := i2cv[r] // r/g/b, 0..255 each
-	cg := i2cv[g]
-	cb := i2cv[b]
-
-	// Calculate the nearest 0-based gray index at 232..255
-	var grayIdx int
-	average := (cr + cg + cb) / 3
-	if average > 238 {
-		grayIdx = 23
-	} else {
-		grayIdx = (average - 3) / 10 // 0..23
-	}
-	gv := 8 + 10*grayIdx // same value for r/g/b, 0..255
-
-	// Return the one which is nearer to the original input rgb value
-	c2 := colorful.Color{R: float64(cr) / 255.0, G: float64(cg) / 255.0, B: float64(cb) / 255.0}
-	g2 := colorful.Color{R: float64(gv) / 255.0, G: float64(gv) / 255.0, B: float64(gv) / 255.0}
-	colorDist := c.DistanceHSLuv(c2)
-	grayDist := c.DistanceHSLuv(g2)
-
-	if colorDist <= grayDist {
-		return ansi.ExtendedColor(16 + ci) //nolint:gosec
-	}
-	return ansi.ExtendedColor(232 + grayIdx) //nolint:gosec
-}
-
-func ansi256ToANSIColor(c ansi.ExtendedColor) ansi.BasicColor {
-	var r int
-	md := math.MaxFloat64
-
-	h, _ := colorful.Hex(ansiHex[c])
-	for i := 0; i <= 15; i++ {
-		hb, _ := colorful.Hex(ansiHex[i])
-		d := h.DistanceHSLuv(hb)
-
-		if d < md {
-			md = d
-			r = i
-		}
-	}
-
-	return ansi.BasicColor(r) //nolint:gosec
-}
-
-// RGB values of ANSI colors (0-255).
-var ansiHex = []string{
-	"#000000",
-	"#800000",
-	"#008000",
-	"#808000",
-	"#000080",
-	"#800080",
-	"#008080",
-	"#c0c0c0",
-	"#808080",
-	"#ff0000",
-	"#00ff00",
-	"#ffff00",
-	"#0000ff",
-	"#ff00ff",
-	"#00ffff",
-	"#ffffff",
-	"#000000",
-	"#00005f",
-	"#000087",
-	"#0000af",
-	"#0000d7",
-	"#0000ff",
-	"#005f00",
-	"#005f5f",
-	"#005f87",
-	"#005faf",
-	"#005fd7",
-	"#005fff",
-	"#008700",
-	"#00875f",
-	"#008787",
-	"#0087af",
-	"#0087d7",
-	"#0087ff",
-	"#00af00",
-	"#00af5f",
-	"#00af87",
-	"#00afaf",
-	"#00afd7",
-	"#00afff",
-	"#00d700",
-	"#00d75f",
-	"#00d787",
-	"#00d7af",
-	"#00d7d7",
-	"#00d7ff",
-	"#00ff00",
-	"#00ff5f",
-	"#00ff87",
-	"#00ffaf",
-	"#00ffd7",
-	"#00ffff",
-	"#5f0000",
-	"#5f005f",
-	"#5f0087",
-	"#5f00af",
-	"#5f00d7",
-	"#5f00ff",
-	"#5f5f00",
-	"#5f5f5f",
-	"#5f5f87",
-	"#5f5faf",
-	"#5f5fd7",
-	"#5f5fff",
-	"#5f8700",
-	"#5f875f",
-	"#5f8787",
-	"#5f87af",
-	"#5f87d7",
-	"#5f87ff",
-	"#5faf00",
-	"#5faf5f",
-	"#5faf87",
-	"#5fafaf",
-	"#5fafd7",
-	"#5fafff",
-	"#5fd700",
-	"#5fd75f",
-	"#5fd787",
-	"#5fd7af",
-	"#5fd7d7",
-	"#5fd7ff",
-	"#5fff00",
-	"#5fff5f",
-	"#5fff87",
-	"#5fffaf",
-	"#5fffd7",
-	"#5fffff",
-	"#870000",
-	"#87005f",
-	"#870087",
-	"#8700af",
-	"#8700d7",
-	"#8700ff",
-	"#875f00",
-	"#875f5f",
-	"#875f87",
-	"#875faf",
-	"#875fd7",
-	"#875fff",
-	"#878700",
-	"#87875f",
-	"#878787",
-	"#8787af",
-	"#8787d7",
-	"#8787ff",
-	"#87af00",
-	"#87af5f",
-	"#87af87",
-	"#87afaf",
-	"#87afd7",
-	"#87afff",
-	"#87d700",
-	"#87d75f",
-	"#87d787",
-	"#87d7af",
-	"#87d7d7",
-	"#87d7ff",
-	"#87ff00",
-	"#87ff5f",
-	"#87ff87",
-	"#87ffaf",
-	"#87ffd7",
-	"#87ffff",
-	"#af0000",
-	"#af005f",
-	"#af0087",
-	"#af00af",
-	"#af00d7",
-	"#af00ff",
-	"#af5f00",
-	"#af5f5f",
-	"#af5f87",
-	"#af5faf",
-	"#af5fd7",
-	"#af5fff",
-	"#af8700",
-	"#af875f",
-	"#af8787",
-	"#af87af",
-	"#af87d7",
-	"#af87ff",
-	"#afaf00",
-	"#afaf5f",
-	"#afaf87",
-	"#afafaf",
-	"#afafd7",
-	"#afafff",
-	"#afd700",
-	"#afd75f",
-	"#afd787",
-	"#afd7af",
-	"#afd7d7",
-	"#afd7ff",
-	"#afff00",
-	"#afff5f",
-	"#afff87",
-	"#afffaf",
-	"#afffd7",
-	"#afffff",
-	"#d70000",
-	"#d7005f",
-	"#d70087",
-	"#d700af",
-	"#d700d7",
-	"#d700ff",
-	"#d75f00",
-	"#d75f5f",
-	"#d75f87",
-	"#d75faf",
-	"#d75fd7",
-	"#d75fff",
-	"#d78700",
-	"#d7875f",
-	"#d78787",
-	"#d787af",
-	"#d787d7",
-	"#d787ff",
-	"#d7af00",
-	"#d7af5f",
-	"#d7af87",
-	"#d7afaf",
-	"#d7afd7",
-	"#d7afff",
-	"#d7d700",
-	"#d7d75f",
-	"#d7d787",
-	"#d7d7af",
-	"#d7d7d7",
-	"#d7d7ff",
-	"#d7ff00",
-	"#d7ff5f",
-	"#d7ff87",
-	"#d7ffaf",
-	"#d7ffd7",
-	"#d7ffff",
-	"#ff0000",
-	"#ff005f",
-	"#ff0087",
-	"#ff00af",
-	"#ff00d7",
-	"#ff00ff",
-	"#ff5f00",
-	"#ff5f5f",
-	"#ff5f87",
-	"#ff5faf",
-	"#ff5fd7",
-	"#ff5fff",
-	"#ff8700",
-	"#ff875f",
-	"#ff8787",
-	"#ff87af",
-	"#ff87d7",
-	"#ff87ff",
-	"#ffaf00",
-	"#ffaf5f",
-	"#ffaf87",
-	"#ffafaf",
-	"#ffafd7",
-	"#ffafff",
-	"#ffd700",
-	"#ffd75f",
-	"#ffd787",
-	"#ffd7af",
-	"#ffd7d7",
-	"#ffd7ff",
-	"#ffff00",
-	"#ffff5f",
-	"#ffff87",
-	"#ffffaf",
-	"#ffffd7",
-	"#ffffff",
-	"#080808",
-	"#121212",
-	"#1c1c1c",
-	"#262626",
-	"#303030",
-	"#3a3a3a",
-	"#444444",
-	"#4e4e4e",
-	"#585858",
-	"#626262",
-	"#6c6c6c",
-	"#767676",
-	"#808080",
-	"#8a8a8a",
-	"#949494",
-	"#9e9e9e",
-	"#a8a8a8",
-	"#b2b2b2",
-	"#bcbcbc",
-	"#c6c6c6",
-	"#d0d0d0",
-	"#dadada",
-	"#e4e4e4",
-	"#eeeeee",
-}

vendor/github.com/charmbracelet/colorprofile/writer.go

@@ -1,166 +0,0 @@
-package colorprofile
-
-import (
-	"bytes"
-	"image/color"
-	"io"
-	"strconv"
-
-	"github.com/charmbracelet/x/ansi"
-)
-
-// NewWriter creates a new color profile writer that downgrades color sequences
-// based on the detected color profile.
-//
-// If environ is nil, it will use os.Environ() to get the environment variables.
-//
-// It queries the given writer to determine if it supports ANSI escape codes.
-// If it does, along with the given environment variables, it will determine
-// the appropriate color profile to use for color formatting.
-//
-// This respects the NO_COLOR, CLICOLOR, and CLICOLOR_FORCE environment variables.
-func NewWriter(w io.Writer, environ []string) *Writer {
-	return &Writer{
-		Forward: w,
-		Profile: Detect(w, environ),
-	}
-}
-
-// Writer represents a color profile writer that writes ANSI sequences to the
-// underlying writer.
-type Writer struct {
-	Forward io.Writer
-	Profile Profile
-}
-
-// Write writes the given text to the underlying writer.
-func (w *Writer) Write(p []byte) (int, error) {
-	switch w.Profile {
-	case TrueColor:
-		return w.Forward.Write(p)
-	case NoTTY:
-		return io.WriteString(w.Forward, ansi.Strip(string(p)))
-	default:
-		return w.downsample(p)
-	}
-}
-
-// downsample downgrades the given text to the appropriate color profile.
-func (w *Writer) downsample(p []byte) (int, error) {
-	var buf bytes.Buffer
-	var state byte
-
-	parser := ansi.GetParser()
-	defer ansi.PutParser(parser)
-
-	for len(p) > 0 {
-		parser.Reset()
-		seq, _, read, newState := ansi.DecodeSequence(p, state, parser)
-
-		switch {
-		case ansi.HasCsiPrefix(seq) && parser.Command() == 'm':
-			handleSgr(w, parser, &buf)
-		default:
-			// If we're not a style SGR sequence, just write the bytes.
-			if n, err := buf.Write(seq); err != nil {
-				return n, err
-			}
-		}
-
-		p = p[read:]
-		state = newState
-	}
-
-	return w.Forward.Write(buf.Bytes())
-}
-
-// WriteString writes the given text to the underlying writer.
-func (w *Writer) WriteString(s string) (n int, err error) {
-	return w.Write([]byte(s))
-}
-
-func handleSgr(w *Writer, p *ansi.Parser, buf *bytes.Buffer) {
-	var style ansi.Style
-	params := p.Params()
-	for i := 0; i < len(params); i++ {
-		param := params[i]
-
-		switch param := param.Param(0); param {
-		case 0:
-			// SGR default parameter is 0. We use an empty string to reduce the
-			// number of bytes written to the buffer.
-			style = append(style, "")
-		case 30, 31, 32, 33, 34, 35, 36, 37: // 8-bit foreground color
-			if w.Profile < ANSI {
-				continue
-			}
-			style = style.ForegroundColor(
-				w.Profile.Convert(ansi.BasicColor(param - 30))) //nolint:gosec
-		case 38: // 16 or 24-bit foreground color
-			var c color.Color
-			if n := ansi.ReadStyleColor(params[i:], &c); n > 0 {
-				i += n - 1
-			}
-			if w.Profile < ANSI {
-				continue
-			}
-			style = style.ForegroundColor(w.Profile.Convert(c))
-		case 39: // default foreground color
-			if w.Profile < ANSI {
-				continue
-			}
-			style = style.DefaultForegroundColor()
-		case 40, 41, 42, 43, 44, 45, 46, 47: // 8-bit background color
-			if w.Profile < ANSI {
-				continue
-			}
-			style = style.BackgroundColor(
-				w.Profile.Convert(ansi.BasicColor(param - 40))) //nolint:gosec
-		case 48: // 16 or 24-bit background color
-			var c color.Color
-			if n := ansi.ReadStyleColor(params[i:], &c); n > 0 {
-				i += n - 1
-			}
-			if w.Profile < ANSI {
-				continue
-			}
-			style = style.BackgroundColor(w.Profile.Convert(c))
-		case 49: // default background color
-			if w.Profile < ANSI {
-				continue
-			}
-			style = style.DefaultBackgroundColor()
-		case 58: // 16 or 24-bit underline color
-			var c color.Color
-			if n := ansi.ReadStyleColor(params[i:], &c); n > 0 {
-				i += n - 1
-			}
-			if w.Profile < ANSI {
-				continue
-			}
-			style = style.UnderlineColor(w.Profile.Convert(c))
-		case 59: // default underline color
-			if w.Profile < ANSI {
-				continue
-			}
-			style = style.DefaultUnderlineColor()
-		case 90, 91, 92, 93, 94, 95, 96, 97: // 8-bit bright foreground color
-			if w.Profile < ANSI {
-				continue
-			}
-			style = style.ForegroundColor(
-				w.Profile.Convert(ansi.BasicColor(param - 90 + 8))) //nolint:gosec
-		case 100, 101, 102, 103, 104, 105, 106, 107: // 8-bit bright background color
-			if w.Profile < ANSI {
-				continue
-			}
-			style = style.BackgroundColor(
-				w.Profile.Convert(ansi.BasicColor(param - 100 + 8))) //nolint:gosec
-		default:
-			// If this is not a color attribute, just append it to the style.
-			style = append(style, strconv.Itoa(param))
-		}
-	}
-
-	_, _ = buf.WriteString(style.String())
-}

vendor/github.com/charmbracelet/lipgloss/.gitignore

@@ -1,2 +1 @@
 ssh_example_ed25519*
-dist/

vendor/github.com/charmbracelet/lipgloss/.golangci-soft.yml

@@ -1,6 +1,5 @@
 run:
   tests: false
-  issues-exit-code: 0
 
 issues:
   include:
@@ -37,4 +36,5 @@ linters:
     - govet
     - ineffassign
     - staticcheck
+    - typecheck
     - unused

vendor/github.com/charmbracelet/lipgloss/.golangci.yml

@@ -15,22 +15,10 @@ issues:
 linters:
   enable:
     - bodyclose
-    - exhaustive
-    - goconst
-    - godot
-    - godox
     - gofumpt
     - goimports
-    - gomoddirectives
-    - goprintffuncname
     - gosec
-    - misspell
-    - nakedret
-    - nestif
     - nilerr
-    - noctx
-    - nolintlint
-    - prealloc
     - revive
     - rowserrcheck
     - sqlclosecheck
@@ -38,4 +26,3 @@ linters:
     - unconvert
     - unparam
     - whitespace
-    - wrapcheck

vendor/github.com/charmbracelet/lipgloss/.goreleaser.yml

@@ -1,5 +1,5 @@
-# yaml-language-server: $schema=https://goreleaser.com/static/schema-pro.json
-version: 2
 includes:
   - from_url:
       url: charmbracelet/meta/main/goreleaser-lib.yaml
+# yaml-language-server: $schema=https://goreleaser.com/static/schema-pro.json
+

vendor/github.com/charmbracelet/lipgloss/README.md

@@ -10,7 +10,7 @@
 
 Style definitions for nice terminal layouts. Built with TUIs in mind.
 
-![Lip Gloss example](https://github.com/user-attachments/assets/7950b1c1-e0e3-427e-8e7d-6f7f6ad17ca7)
+![Lip Gloss example](https://github.com/user-attachments/assets/99c5c015-551b-4897-8cd1-bcaafa0aad5a)
 
 Lip Gloss takes an expressive, declarative approach to terminal rendering.
 Users familiar with CSS will feel at home with Lip Gloss.
@@ -425,28 +425,17 @@ rows := [][]string{
 Use the table package to style and render the table.
 
 ```go
-var (
-    purple    = lipgloss.Color("99")
-    gray      = lipgloss.Color("245")
-    lightGray = lipgloss.Color("241")
-
-    headerStyle  = lipgloss.NewStyle().Foreground(purple).Bold(true).Align(lipgloss.Center)
-    cellStyle    = lipgloss.NewStyle().Padding(0, 1).Width(14)
-    oddRowStyle  = cellStyle.Foreground(gray)
-    evenRowStyle = cellStyle.Foreground(lightGray)
-)
-
 t := table.New().
     Border(lipgloss.NormalBorder()).
-    BorderStyle(lipgloss.NewStyle().Foreground(purple)).
+    BorderStyle(lipgloss.NewStyle().Foreground(lipgloss.Color("99"))).
     StyleFunc(func(row, col int) lipgloss.Style {
         switch {
-        case row == table.HeaderRow:
+        case row == 0:
-            return headerStyle
+            return HeaderStyle
         case row%2 == 0:
-            return evenRowStyle
+            return EvenRowStyle
         default:
-            return oddRowStyle
+            return OddRowStyle
         }
     }).
     Headers("LANGUAGE", "FORMAL", "INFORMAL").
@@ -464,45 +453,6 @@ fmt.Println(t)
 
 ![Table Example](https://github.com/charmbracelet/lipgloss/assets/42545625/6e4b70c4-f494-45da-a467-bdd27df30d5d)
 
-> [!WARNING]
-> Table `Rows` need to be declared before `Offset` otherwise it does nothing.
-
-### Table Borders
-
-There are helpers to generate tables in markdown or ASCII style:
-
-#### Markdown Table
-
-```go
-table.New().Border(lipgloss.MarkdownBorder()).BorderTop(false).BorderBottom(false)
-```
-
-```
-| LANGUAGE |    FORMAL    | INFORMAL  |
-|----------|--------------|-----------|
-| Chinese  | Nǐn hǎo      | Nǐ hǎo    |
-| French   | Bonjour      | Salut     |
-| Russian  | Zdravstvuyte | Privet    |
-| Spanish  | Hola         | ¿Qué tal? |
-```
-
-#### ASCII Table
-
-```go
-table.New().Border(lipgloss.ASCIIBorder())
-```
-
-```
-+----------+--------------+-----------+
-| LANGUAGE |    FORMAL    | INFORMAL  |
-+----------+--------------+-----------+
-| Chinese  | Nǐn hǎo      | Nǐ hǎo    |
-| French   | Bonjour      | Salut     |
-| Russian  | Zdravstvuyte | Privet    |
-| Spanish  | Hola         | ¿Qué tal? |
-+----------+--------------+-----------+
-```
-
 For more on tables see [the docs](https://pkg.go.dev/github.com/charmbracelet/lipgloss?tab=doc) and [examples](https://github.com/charmbracelet/lipgloss/tree/master/examples/table).
 
 ## Rendering Lists

vendor/github.com/charmbracelet/lipgloss/Taskfile.yaml

@@ -1,19 +0,0 @@
-# https://taskfile.dev
-
-version: '3'
-
-tasks:
-  lint:
-    desc: Run base linters
-    cmds:
-      - golangci-lint run
-
-  test:
-    desc: Run tests
-    cmds:
-      - go test ./... {{.CLI_ARGS}}
-
-  test:table:
-    desc: Run table tests
-    cmds:
-      - go test ./table {{.CLI_ARGS}}

vendor/github.com/charmbracelet/lipgloss/align.go

@@ -30,8 +30,8 @@ func alignTextHorizontal(str string, pos Position, width int, style *termenv.Sty
 				l = s + l
 			case Center:
 				// Note: remainder goes on the right.
-				left := shortAmount / 2       //nolint:mnd
+				left := shortAmount / 2       //nolint:gomnd
-				right := left + shortAmount%2 //nolint:mnd
+				right := left + shortAmount%2 //nolint:gomnd
 
 				leftSpaces := strings.Repeat(" ", left)
 				rightSpaces := strings.Repeat(" ", right)
@@ -69,7 +69,7 @@ func alignTextVertical(str string, pos Position, height int, _ *termenv.Style) s
 	case Top:
 		return str + strings.Repeat("\n", height-strHeight)
 	case Center:
-		topPadding, bottomPadding := (height-strHeight)/2, (height-strHeight)/2 //nolint:mnd
+		topPadding, bottomPadding := (height-strHeight)/2, (height-strHeight)/2 //nolint:gomnd
 		if strHeight+topPadding+bottomPadding > height {
 			topPadding--
 		} else if strHeight+topPadding+bottomPadding < height {

vendor/github.com/charmbracelet/lipgloss/borders.go

@@ -108,11 +108,6 @@ var (
 		TopRight:    "█",
 		BottomLeft:  "█",
 		BottomRight: "█",
-		MiddleLeft:   "█",
-		MiddleRight:  "█",
-		Middle:       "█",
-		MiddleTop:    "█",
-		MiddleBottom: "█",
 	}
 
 	outerHalfBlockBorder = Border{
@@ -184,38 +179,6 @@ var (
 		MiddleTop:    " ",
 		MiddleBottom: " ",
 	}
-
-	markdownBorder = Border{
-		Top:          "-",
-		Bottom:       "-",
-		Left:         "|",
-		Right:        "|",
-		TopLeft:      "|",
-		TopRight:     "|",
-		BottomLeft:   "|",
-		BottomRight:  "|",
-		MiddleLeft:   "|",
-		MiddleRight:  "|",
-		Middle:       "|",
-		MiddleTop:    "|",
-		MiddleBottom: "|",
-	}
-
-	asciiBorder = Border{
-		Top:          "-",
-		Bottom:       "-",
-		Left:         "|",
-		Right:        "|",
-		TopLeft:      "+",
-		TopRight:     "+",
-		BottomLeft:   "+",
-		BottomRight:  "+",
-		MiddleLeft:   "+",
-		MiddleRight:  "+",
-		Middle:       "+",
-		MiddleTop:    "+",
-		MiddleBottom: "+",
-	}
 )
 
 // NormalBorder returns a standard-type border with a normal weight and 90
@@ -263,23 +226,13 @@ func HiddenBorder() Border {
 	return hiddenBorder
 }
 
-// MarkdownBorder return a table border in markdown style.
-//
-// Make sure to disable top and bottom border for the best result. This will
-// ensure that the output is valid markdown.
-//
-//	table.New().Border(lipgloss.MarkdownBorder()).BorderTop(false).BorderBottom(false)
-func MarkdownBorder() Border {
-	return markdownBorder
-}
-
-// ASCIIBorder returns a table border with ASCII characters.
-func ASCIIBorder() Border {
-	return asciiBorder
-}
-
 func (s Style) applyBorder(str string) string {
 	var (
+		topSet    = s.isSet(borderTopKey)
+		rightSet  = s.isSet(borderRightKey)
+		bottomSet = s.isSet(borderBottomKey)
+		leftSet   = s.isSet(borderLeftKey)
+
 		border    = s.getBorderStyle()
 		hasTop    = s.getAsBool(borderTopKey, false)
 		hasRight  = s.getAsBool(borderRightKey, false)
@@ -299,7 +252,7 @@ func (s Style) applyBorder(str string) string {
 
 	// If a border is set and no sides have been specifically turned on or off
 	// render borders on all sides.
-	if s.implicitBorders() {
+	if border != noBorder && !(topSet || rightSet || bottomSet || leftSet) {
 		hasTop = true
 		hasRight = true
 		hasBottom = true

vendor/github.com/charmbracelet/lipgloss/color.go

@@ -35,7 +35,7 @@ func (NoColor) color(*Renderer) termenv.Color {
 //
 // Deprecated.
 func (n NoColor) RGBA() (r, g, b, a uint32) {
-	return 0x0, 0x0, 0x0, 0xFFFF //nolint:mnd
+	return 0x0, 0x0, 0x0, 0xFFFF //nolint:gomnd
 }
 
 // Color specifies a color by hex or ANSI value. For example: