Merge remote-tracking branch 'origin/main' into raja_v2_start

Author: boks1971

.gitignore

@@ -17,4 +17,7 @@ bin/
 .idea/
 dist/
 
-.DS_Store
+# Local artifacts
+.task/
+
+.DS_Store

cmd/lk/agent.go

@@ -99,7 +99,10 @@ var (
 						silentFlag,
 						regionFlag,
 					},
-					ArgsUsage: "[working-dir]",
+					// NOTE: since secrets may contain commas, or indeed any special character we might want to treat as a flag separator,
+					// we disable it entirely here and require multiple --secrets flags to be used.
+					DisableSliceFlagSeparator: true,
+					ArgsUsage:                 "[working-dir]",
 				},
 				{
 					Name:   "config",
@@ -120,7 +123,10 @@ var (
 						secretsFlag,
 						secretsFileFlag,
 					},
-					ArgsUsage: "[working-dir]",
+					// NOTE: since secrets may contain commas, or indeed any special character we might want to treat as a flag separator,
+					// we disable it entirely here and require multiple --secrets flags to be used.
+					DisableSliceFlagSeparator: true,
+					ArgsUsage:                 "[working-dir]",
 				},
 				{
 					Name:   "status",
@@ -141,7 +147,10 @@ var (
 						secretsFlag,
 						secretsFileFlag,
 					},
-					ArgsUsage: "[working-dir]",
+					// NOTE: since secrets may contain commas, or indeed any special character we might want to treat as a flag separator,
+					// we disable it entirely here and require multiple --secrets flags to be used.
+					DisableSliceFlagSeparator: true,
+					ArgsUsage:                 "[working-dir]",
 				},
 				{
 					Name:   "restart",
@@ -237,7 +246,10 @@ var (
 							Value:    false,
 						},
 					},
-					ArgsUsage: "[working-dir]",
+					// NOTE: since secrets may contain commas, or indeed any special character we might want to treat as a flag separator,
+					// we disable it entirely here and require multiple --secrets flags to be used.
+					DisableSliceFlagSeparator: true,
+					ArgsUsage:                 "[working-dir]",
 				},
 			},
 		},
@@ -293,7 +305,7 @@ func createAgent(ctx context.Context, cmd *cli.Command) error {
 	}
 
 	// We have a configured project, but don't need to double-confirm if it was
-	// set via a command line flag, because intent it clear.
+	// set via a command line flag, because intent is clear.
 	if !cmd.IsSet("project") {
 		useProject := true
 		if err := huh.NewForm(huh.NewGroup(huh.NewConfirm().
@@ -352,10 +364,21 @@ func createAgent(ctx context.Context, cmd *cli.Command) error {
 		return err
 	}
 
-	if err := requireDockerfile(ctx, cmd, workingDir); err != nil {
+	settingsMap, err := getClientSettings(ctx, cmd.Bool("silent"))
+	if err != nil {
+		return err
+	}
+
+	if err := requireDockerfile(ctx, cmd, workingDir, settingsMap); err != nil {
 		return err
 	}
 
+	// TODO (steveyoon): disable check SDK version until we add support for uv and lockfile generation
+	// https://github.com/livekit/livekit-cli/pull/618/files
+	// if err := agentfs.CheckSDKVersion(workingDir, settingsMap); err != nil {
+	// 	return err
+	// }
+
 	req := &lkproto.CreateAgentRequest{
 		Secrets: secrets,
 		Regions: lkConfig.Agent.Regions,
@@ -1003,13 +1026,18 @@ func selectAgent(ctx context.Context, _ *cli.Command) (string, error) {
 func requireSecrets(_ context.Context, cmd *cli.Command, required, lazy bool) ([]*lkproto.AgentSecret, error) {
 	silent := cmd.Bool("silent")
 	secrets := make(map[string]*lkproto.AgentSecret)
-	for _, secret := range cmd.StringSlice("secrets") {
-		secret := strings.Split(secret, "=")
-		agentSecret := &lkproto.AgentSecret{
-			Name:  secret[0],
-			Value: []byte(secret[1]),
+
+	if values, err := parseKeyValuePairs(cmd, "secrets"); err != nil {
+		return nil, fmt.Errorf("failed to parse secrets: %w", err)
+	} else {
+		for key, val := range values {
+			agentSecret := &lkproto.AgentSecret{
+				Name:  key,
+				Value: []byte(val),
+			}
+			secrets[key] = agentSecret
 		}
-		secrets[secret[0]] = agentSecret
+
 	}
 
 	shouldReadFromDisk := cmd.IsSet("secrets-file") || !lazy || (required && len(secrets) == 0)
@@ -1056,42 +1084,13 @@ func requireSecrets(_ context.Context, cmd *cli.Command, required, lazy bool) ([
 	return secretsSlice, nil
 }
 
-func requireDockerfile(ctx context.Context, cmd *cli.Command, workingDir string) error {
+func requireDockerfile(ctx context.Context, cmd *cli.Command, workingDir string, settingsMap map[string]string) error {
 	dockerfileExists, err := agentfs.HasDockerfile(workingDir)
 	if err != nil {
 		return err
 	}
 
 	if !dockerfileExists {
-		var clientSettingsResponse *lkproto.ClientSettingsResponse
-
-		if !cmd.Bool("silent") {
-			if err := util.Await(
-				"Loading client settings...",
-				func() {
-					clientSettingsResponse, err = agentsClient.GetClientSettings(ctx, &lkproto.ClientSettingsRequest{})
-				},
-			); err != nil {
-				return err
-			}
-		} else {
-			clientSettingsResponse, err = agentsClient.GetClientSettings(ctx, &lkproto.ClientSettingsRequest{})
-		}
-
-		if err != nil {
-			if twerr, ok := err.(twirp.Error); ok {
-				if twerr.Code() == twirp.PermissionDenied {
-					return fmt.Errorf("agent hosting is disabled for this project -- join the beta program here [%s]", cloudAgentsBetaSignupURL)
-				}
-			}
-			return err
-		}
-
-		settingsMap := make(map[string]string)
-		for _, setting := range clientSettingsResponse.Params {
-			settingsMap[setting.Name] = setting.Value
-		}
-
 		if !cmd.Bool("silent") {
 			var innerErr error
 			if err := util.Await(
@@ -1120,6 +1119,38 @@ func requireDockerfile(ctx context.Context, cmd *cli.Command, workingDir string)
 	return nil
 }
 
+func getClientSettings(ctx context.Context, silent bool) (map[string]string, error) {
+	var clientSettingsResponse *lkproto.ClientSettingsResponse
+	var err error
+
+	if !silent {
+		err = util.Await(
+			"Loading client settings...",
+			func() {
+				clientSettingsResponse, err = agentsClient.GetClientSettings(ctx, &lkproto.ClientSettingsRequest{})
+			},
+		)
+	} else {
+		clientSettingsResponse, err = agentsClient.GetClientSettings(ctx, &lkproto.ClientSettingsRequest{})
+	}
+
+	if err != nil {
+		if twerr, ok := err.(twirp.Error); ok {
+			if twerr.Code() == twirp.PermissionDenied {
+				return nil, fmt.Errorf("agent hosting is disabled for this project -- join the beta program here [%s]", cloudAgentsBetaSignupURL)
+			}
+		}
+		return nil, err
+	}
+
+	settingsMap := make(map[string]string)
+	for _, setting := range clientSettingsResponse.Params {
+		settingsMap[setting.Name] = setting.Value
+	}
+
+	return settingsMap, nil
+}
+
 func requireConfig(workingDir, tomlFilename string) (bool, error) {
 	if lkConfig != nil {
 		return true, nil

cmd/lk/app.go

@@ -18,6 +18,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"maps"
 	"os"
 	"regexp"
 	"strings"
@@ -453,9 +454,7 @@ func instantiateEnv(ctx context.Context, cmd *cli.Command, rootPath string, addl
 	}
 
 	if addlEnv != nil {
-		for k, v := range *addlEnv {
-			env[k] = v
-		}
+		maps.Copy(env, *addlEnv)
 	}
 
 	prompt := func(key, oldValue string) (string, error) {
@@ -526,16 +525,42 @@ func doInstall(ctx context.Context, task bootstrap.KnownTask, rootPath string, v
 func runTask(ctx context.Context, cmd *cli.Command) error {
 	verbose := cmd.Bool("verbose")
 	rootDir := "."
-	tf, err := bootstrap.ParseTaskfile(rootDir)
+
+	args := cmd.Args().Tail()
+	if len(args) > 0 {
+		dirPath := args[0]
+		if stat, err := os.Stat(dirPath); os.IsNotExist(err) {
+			return fmt.Errorf("directory does not exist: %s", dirPath)
+		} else if err != nil {
+			return fmt.Errorf("error accessing directory %s: %v", dirPath, err)
+		} else {
+			if !stat.IsDir() {
+				return fmt.Errorf("path is not a directory: %s", dirPath)
+			}
+			rootDir = dirPath
+		}
+	}
+
+	_, err := bootstrap.ParseTaskfile(rootDir)
 	if err != nil {
 		return err
 	}
 
+	exe := bootstrap.NewTaskExecutor(rootDir, verbose)
+	if err := exe.Setup(); err != nil {
+		return fmt.Errorf("could not initialize task executor: %w", err)
+	}
+
 	taskName := cmd.Args().First()
 	if taskName == "" {
+		tasks, err := exe.GetTaskList()
+		if err != nil {
+			return err
+		}
+
 		var options []huh.Option[string]
-		for name := range tf.Tasks.Keys(nil) {
-			options = append(options, huh.NewOption(name, name))
+		for _, t := range tasks {
+			options = append(options, huh.NewOption(t.Name(), t.Name()))
 		}
 
 		if err := huh.NewForm(
@@ -549,16 +574,9 @@ func runTask(ctx context.Context, cmd *cli.Command) error {
 		}
 	}
 
-	task, err := bootstrap.NewTask(ctx, tf, rootDir, taskName, verbose)
+	task, err := bootstrap.NewTaskWithExecutor(ctx, exe, taskName, verbose)
 	if err != nil {
 		return err
 	}
-	var cmdErr error
-	if err := util.Await(
-		"Running task "+taskName+"...",
-		func() { cmdErr = task() },
-	); err != nil {
-		return err
-	}
-	return cmdErr
+	return task()
 }

cmd/lk/room.go

@@ -18,6 +18,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"maps"
 	"os"
 	"os/signal"
 	"regexp"
@@ -939,14 +940,9 @@ func joinRoom(ctx context.Context, cmd *cli.Command) error {
 		},
 	}
 
-	participantAttributes := make(map[string]string)
-
-	attrs := cmd.StringSlice("attribute")
-	for _, attr := range attrs {
-		kv := strings.Split(attr, "=")
-		if len(kv) == 2 {
-			participantAttributes[kv[0]] = kv[1]
-		}
+	participantAttributes, err := parseKeyValuePairs(cmd, "attribute")
+	if err != nil {
+		return fmt.Errorf("failed to parse participant attributes: %w", err)
 	}
 
 	// Read attributes from JSON file if specified
@@ -962,9 +958,7 @@ func joinRoom(ctx context.Context, cmd *cli.Command) error {
 		}
 
 		// Add attributes from file to the existing ones
-		for key, value := range fileAttrs {
-			participantAttributes[key] = value
-		}
+		maps.Copy(participantAttributes, fileAttrs)
 	}
 
 	room, err := lksdk.ConnectToRoom(project.URL, lksdk.ConnectInfo{

cmd/lk/utils.go

@@ -17,9 +17,11 @@ package main
 import (
 	"errors"
 	"fmt"
+	"maps"
 	"os"
 	"strings"
 
+	"github.com/joho/godotenv"
 	"github.com/twitchtv/twirp"
 	"github.com/urfave/cli/v3"
 
@@ -160,6 +162,24 @@ func extractFlagOrArg(c *cli.Command, flag string) (string, error) {
 	return value, nil
 }
 
+func parseKeyValuePairs(c *cli.Command, flag string) (map[string]string, error) {
+	pairs := c.StringSlice(flag)
+	if len(pairs) == 0 {
+		return nil, nil
+	}
+
+	result := make(map[string]string, len(pairs))
+
+	for _, pair := range pairs {
+		if m, err := godotenv.Unmarshal(pair); err != nil {
+			return nil, fmt.Errorf("invalid key-value pair: %s: %w", pair, err)
+		} else {
+			maps.Copy(result, m)
+		}
+	}
+	return result, nil
+}
+
 type loadParams struct {
 	requireURL bool
 }