chore(agents): add support for rich errors from cloud-agents (#541)

* chore(agents): add support for rich errors from `cloud-agents`

* chore(cli): bump version

Author: rektdeckard

cmd/lk/agent.go

@@ -27,6 +27,7 @@ import (
 
 	"github.com/BurntSushi/toml"
 	"github.com/charmbracelet/huh"
+	"github.com/twitchtv/twirp"
 	"github.com/urfave/cli/v3"
 
 	"github.com/livekit/livekit-cli/v2/pkg/agentfs"
@@ -362,6 +363,7 @@ func createAgent(ctx context.Context, cmd *cli.Command) error {
 			if err := huh.NewInput().
 				Title("Agent name").
 				Value(&name).
+				WithTheme(util.Theme).
 				Run(); err != nil {
 				return err
 			}
@@ -524,6 +526,11 @@ func createAgent(ctx context.Context, cmd *cli.Command) error {
 
 	resp, err := agentsClient.CreateAgent(ctx, req)
 	if err != nil {
+		if twerr, ok := err.(twirp.Error); ok {
+			if twerr.Meta("type") == "agent_hosting_disabled" {
+				return fmt.Errorf("agent hosting is disabled for this project -- join the beta program here [%s]", twerr.Meta("redirect_url"))
+			}
+		}
 		return err
 	}
 
@@ -1124,13 +1131,13 @@ func selectSecrets(secrets map[string]string) (map[string]string, error) {
 		return options[i].Key < options[j].Key
 	})
 
-	if err := huh.NewMultiSelect[string]().
-		Title("Select secrets to include").
-		Description("Press space to toggle, enter to confirm").
-		Options(options...).
-		Value(&keys).
-		Height(6).
-		WithTheme(util.Theme).
+	if err := huh.NewForm(
+		huh.NewGroup(huh.NewMultiSelect[string]().
+			Title("Select secrets to include").
+			Options(options...).
+			Value(&keys).
+			Height(6).
+			WithTheme(util.Theme))).
 		Run(); err != nil {
 		return nil, fmt.Errorf("error running TUI: %w", err)
 	}

cmd/lk/app.go

@@ -152,12 +152,13 @@ func requireProject(ctx context.Context, cmd *cli.Command) (context.Context, err
 			for _, p := range cliConfig.Projects {
 				options = append(options, huh.NewOption(p.Name+" ["+p.APIKey+"]", &p))
 			}
-			if err = huh.NewSelect[*config.ProjectConfig]().
-				Title("Select a project to use for this app").
-				Description("If you'd like to use a different project, run `lk cloud auth` to add credentials").
-				Options(options...).
-				Value(&project).
-				WithTheme(util.Theme).
+			if err = huh.NewForm(
+				huh.NewGroup(huh.NewSelect[*config.ProjectConfig]().
+					Title("Select a project to use for this app").
+					Description("If you'd like to use a different project, run `lk cloud auth` to add credentials").
+					Options(options...).
+					Value(&project).
+					WithTheme(util.Theme))).
 				Run(); err != nil {
 				return nil, err
 			}
@@ -512,11 +513,12 @@ func runTask(ctx context.Context, cmd *cli.Command) error {
 			options = append(options, huh.NewOption(name, name))
 		}
 
-		if err := huh.NewSelect[string]().
-			Title("Select Task").
-			Options(options...).
-			Value(&taskName).
-			WithTheme(util.Theme).
+		if err := huh.NewForm(
+			huh.NewGroup(huh.NewSelect[string]().
+				Title("Select Task").
+				Options(options...).
+				Value(&taskName).
+				WithTheme(util.Theme))).
 			Run(); err != nil {
 			return err
 		}

cmd/lk/token.go

@@ -287,20 +287,21 @@ func createToken(ctx context.Context, c *cli.Command) error {
 
 		permissions := make([]permission, 0)
 
-		if err := huh.NewMultiSelect[permission]().
-			Options(
-				huh.NewOption("Create", pCreate),
-				huh.NewOption("List", pList),
-				huh.NewOption("Join", pJoin),
-				huh.NewOption("Admin", pAdmin),
-				huh.NewOption("Egress", pEgress),
-				huh.NewOption("Ingress", pIngress),
-				huh.NewOption("Update metadata", pMetadata),
-			).
-			Title("Token Permissions").
-			Description("See https://docs.livekit.io/home/get-started/authentication/#Video-grant").
-			Value(&permissions).
-			WithTheme(util.Theme).
+		if err := huh.NewForm(
+			huh.NewGroup(huh.NewMultiSelect[permission]().
+				Options(
+					huh.NewOption("Create", pCreate),
+					huh.NewOption("List", pList),
+					huh.NewOption("Join", pJoin),
+					huh.NewOption("Admin", pAdmin),
+					huh.NewOption("Egress", pEgress),
+					huh.NewOption("Ingress", pIngress),
+					huh.NewOption("Update metadata", pMetadata),
+				).
+				Title("Token Permissions").
+				Description("See https://docs.livekit.io/home/get-started/authentication/#Video-grant").
+				Value(&permissions).
+				WithTheme(util.Theme))).
 			Run(); err != nil || len(permissions) == 0 {
 			return errors.New("no permissions were given in this grant, see --help")
 		} else {

pkg/agentfs/docker.go

@@ -26,6 +26,7 @@ import (
 
 	"github.com/charmbracelet/huh"
 
+	"github.com/livekit/livekit-cli/v2/pkg/util"
 	"github.com/livekit/protocol/logger"
 )
 
@@ -176,7 +177,8 @@ func validateEntrypoint(dir string, dockerfileContent []byte, projectType string
 				huh.NewSelect[string]().
 					Title(fmt.Sprintf("Select %s file to use as entrypoint", projectType)).
 					Options(huh.NewOptions(options...)...).
-					Value(&selected),
+					Value(&selected).
+					WithTheme(util.Theme),
 			),
 		)
 

pkg/agentfs/logs.go

@@ -17,6 +17,7 @@ package agentfs
 import (
 	"bufio"
 	"context"
+	"encoding/json"
 	"fmt"
 	"net/http"
 	"net/url"
@@ -29,6 +30,11 @@ import (
 	"github.com/livekit/protocol/logger"
 )
 
+type APIError struct {
+	Message string             `json:"msg"`
+	Meta    *map[string]string `json:"meta,omitempty"`
+}
+
 func LogHelper(ctx context.Context, id string, name string, logType string, projectConfig *config.ProjectConfig) error {
 	if logType == "" {
 		logType = "deploy"
@@ -85,6 +91,13 @@ func LogHelper(ctx context.Context, id string, name string, logType string, proj
 
 	if resp.StatusCode != http.StatusOK {
 		logger.Debugw("failed to get logs", "status", resp.Status)
+
+		var errorResponse APIError
+		if err := json.NewDecoder(resp.Body).Decode(&errorResponse); err != nil {
+			return fmt.Errorf("failed to parse error response: %w", err)
+		} else {
+			return fmt.Errorf("failed to get logs: %s", errorResponse.Message)
+		}
 	}
 
 	scanner := bufio.NewScanner(resp.Body)

version.go

@@ -15,5 +15,5 @@
 package livekitcli
 
 const (
-	Version = "2.4.1"
+	Version = "2.4.2"
 )