resolve conflicts

Signed-off-by: bryans-go <[email protected]>

cmd/daytona/config/config.go

@@ -44,12 +44,6 @@ type GitProvider struct {
 	Name string
 }
 
-const configDoesntExistError = "config does not exist. Run `daytona serve` to create a default profile or `daytona profile add` to connect to a remote server."
-
-func IsNotExist(err error) bool {
-	return err.Error() == configDoesntExistError
-}
-
 func GetConfig() (*Config, error) {
 	configFilePath, err := getConfigPath()
 	if err != nil {
@@ -58,7 +52,12 @@ func GetConfig() (*Config, error) {
 
 	_, err = os.Stat(configFilePath)
 	if os.IsNotExist(err) {
-		return nil, errors.New(configDoesntExistError)
+		config := &Config{
+			Id:               uuid.NewString(),
+			DefaultIdeId:     DefaultIdeId,
+			TelemetryEnabled: true,
+		}
+		return config, config.Save()
 	}
 
 	if err != nil {

docs/daytona_prebuild_add.md

@@ -3,13 +3,17 @@
 Add a prebuild configuration
 
 ```
-daytona prebuild add [flags]
+daytona prebuild add [PROJECT_CONFIG] [flags]
 ```
 
 ### Options
 
 ```
-      --run   Run the prebuild once after adding it
+  -b, --branch string           Git branch for the prebuild
+  -c, --commit-interval int     Commit interval for running a prebuild - leave blank to ignore push events
+  -r, --retention int           Maximum number of resulting builds stored at a time
+      --run                     Run the prebuild once after adding it
+  -t, --trigger-files strings   Full paths of files whose changes should explicitly trigger a  prebuild
 ```
 
 ### Options inherited from parent commands

docs/daytona_prebuild_update.md

@@ -3,13 +3,17 @@
 Update a prebuild configuration
 
 ```
-daytona prebuild update [flags]
+daytona prebuild update [PROJECT_CONFIG] [PREBUILD_ID] [flags]
 ```
 
 ### Options
 
 ```
-      --run   Run the prebuild once after updating it
+  -b, --branch string           Git branch for the prebuild
+  -c, --commit-interval int     Commit interval for running a prebuild - leave blank to ignore push events
+  -r, --retention int           Maximum number of resulting builds stored at a time
+      --run                     Run the prebuild once after updating it
+  -t, --trigger-files strings   Full paths of files whose changes should explicitly trigger a  prebuild
 ```
 
 ### Options inherited from parent commands

hack/docs/daytona_prebuild_add.yaml

@@ -1,10 +1,27 @@
 name: daytona prebuild add
 synopsis: Add a prebuild configuration
-usage: daytona prebuild add [flags]
+usage: daytona prebuild add [PROJECT_CONFIG] [flags]
 options:
+    - name: branch
+      shorthand: b
+      usage: Git branch for the prebuild
+    - name: commit-interval
+      shorthand: c
+      default_value: "0"
+      usage: |
+        Commit interval for running a prebuild - leave blank to ignore push events
+    - name: retention
+      shorthand: r
+      default_value: "0"
+      usage: Maximum number of resulting builds stored at a time
     - name: run
       default_value: "false"
       usage: Run the prebuild once after adding it
+    - name: trigger-files
+      shorthand: t
+      default_value: '[]'
+      usage: |
+        Full paths of files whose changes should explicitly trigger a  prebuild
 inherited_options:
     - name: help
       default_value: "false"

hack/docs/daytona_prebuild_update.yaml

@@ -1,10 +1,27 @@
 name: daytona prebuild update
 synopsis: Update a prebuild configuration
-usage: daytona prebuild update [flags]
+usage: daytona prebuild update [PROJECT_CONFIG] [PREBUILD_ID] [flags]
 options:
+    - name: branch
+      shorthand: b
+      usage: Git branch for the prebuild
+    - name: commit-interval
+      shorthand: c
+      default_value: "0"
+      usage: |
+        Commit interval for running a prebuild - leave blank to ignore push events
+    - name: retention
+      shorthand: r
+      default_value: "0"
+      usage: Maximum number of resulting builds stored at a time
     - name: run
       default_value: "false"
       usage: Run the prebuild once after updating it
+    - name: trigger-files
+      shorthand: t
+      default_value: '[]'
+      usage: |
+        Full paths of files whose changes should explicitly trigger a  prebuild
 inherited_options:
     - name: help
       default_value: "false"

pkg/agent/agent.go

@@ -49,7 +49,7 @@ func (a *Agent) Start() error {
 }
 
 func (a *Agent) startProjectMode() error {
-	err := a.setDefaultConfig()
+	err := a.ensureDefaultProfile()
 	if err != nil {
 		return err
 	}
@@ -195,38 +195,33 @@ func (a *Agent) getGitUser(gitProviderId string) (*apiclient.GitUser, error) {
 	return userData, nil
 }
 
-func (a *Agent) setDefaultConfig() error {
+func (a *Agent) ensureDefaultProfile() error {
 	existingConfig, err := config.GetConfig()
-	if err != nil && !config.IsNotExist(err) {
+	if err != nil {
 		return err
 	}
 
-	if existingConfig != nil {
-		for _, profile := range existingConfig.Profiles {
-			if profile.Id == "default" {
-				return nil
-			}
-		}
+	if existingConfig == nil {
+		return errors.New("config does not exist")
 	}
 
-	config := &config.Config{
-		Id:              a.Config.ClientId,
-		ActiveProfileId: "default",
-		DefaultIdeId:    "vscode",
-		Profiles: []config.Profile{
-			{
-				Id:   "default",
-				Name: "default",
-				Api: config.ServerApi{
-					Url: a.Config.Server.ApiUrl,
-					Key: a.Config.Server.ApiKey,
-				},
-			},
-		},
-		TelemetryEnabled: a.TelemetryEnabled,
+	for _, profile := range existingConfig.Profiles {
+		if profile.Id == "default" {
+			return nil
+		}
 	}
 
-	return config.Save()
+	existingConfig.Id = a.Config.ClientId
+	existingConfig.TelemetryEnabled = a.TelemetryEnabled
+
+	return existingConfig.AddProfile(config.Profile{
+		Id:   "default",
+		Name: "default",
+		Api: config.ServerApi{
+			Url: a.Config.Server.ApiUrl,
+			Key: a.Config.Server.ApiKey,
+		},
+	})
 }
 
 // Agent uptime in seconds

pkg/api/controllers/provider/install.go

@@ -40,7 +40,7 @@ func InstallProvider(ctx *gin.Context) {
 		}
 	}
 
-	downloadPath, err := server.ProviderManager.DownloadProvider(req.DownloadUrls, req.Name, true)
+	downloadPath, err := server.ProviderManager.DownloadProvider(ctx.Request.Context(), req.DownloadUrls, req.Name, true)
 	if err != nil {
 		ctx.AbortWithError(http.StatusInternalServerError, fmt.Errorf("failed to download provider: %w", err))
 		return

pkg/cmd/apikey/generate.go

@@ -12,8 +12,8 @@ import (
 	"github.com/daytonaio/daytona/internal/util"
 	apiclient_util "github.com/daytonaio/daytona/internal/util/apiclient"
 	"github.com/daytonaio/daytona/pkg/apiclient"
-	"github.com/daytonaio/daytona/pkg/views/server/apikey"
-	view "github.com/daytonaio/daytona/pkg/views/server/apikey"
+	"github.com/daytonaio/daytona/pkg/views/apikey"
+	view "github.com/daytonaio/daytona/pkg/views/apikey"
 )
 
 var GenerateCmd = &cobra.Command{

pkg/cmd/apikey/list.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/daytonaio/daytona/internal/util/apiclient"
 	"github.com/daytonaio/daytona/pkg/cmd/format"
-	"github.com/daytonaio/daytona/pkg/views/server/apikey"
+	"github.com/daytonaio/daytona/pkg/views/apikey"
 	"github.com/spf13/cobra"
 )
 

pkg/cmd/apikey/revoke.go

@@ -17,7 +17,7 @@ import (
 	"github.com/daytonaio/daytona/pkg/apiclient"
 	"github.com/daytonaio/daytona/pkg/common"
 	"github.com/daytonaio/daytona/pkg/views"
-	"github.com/daytonaio/daytona/pkg/views/server/apikey"
+	"github.com/daytonaio/daytona/pkg/views/apikey"
 )
 
 var yesFlag bool

pkg/cmd/cmd.go

@@ -4,9 +4,11 @@
 package cmd
 
 import (
+	"errors"
 	"fmt"
 	"os"
 	"os/signal"
+	"slices"
 	"strings"
 	"time"
 
@@ -92,6 +94,11 @@ func Execute() error {
 		return cmd.Help()
 	}
 
+	err = ensureProfiles(cmd)
+	if err != nil {
+		return err
+	}
+
 	err = rootCmd.Execute()
 
 	endTime := time.Now()
@@ -141,6 +148,36 @@ func validateCommands(rootCmd *cobra.Command, args []string) (cmd *cobra.Command
 	return currentCmd, flags, nil
 }
 
+func ensureProfiles(cmd *cobra.Command) error {
+	exemptions := []string{
+		"daytona",
+		"daytona help",
+		"daytona docs",
+		"daytona version",
+		"daytona profile add",
+		"daytona serve",
+		"daytona server",
+		"daytona ide",
+		"daytona telemetry enable",
+		"daytona telemetry disable",
+	}
+
+	if slices.Contains(exemptions, cmd.CommandPath()) {
+		return nil
+	}
+
+	c, err := config.GetConfig()
+	if err != nil {
+		return err
+	}
+
+	if len(c.Profiles) == 0 {
+		return errors.New("no profiles found. Run `daytona serve` to create a default profile or `daytona profile add` to connect to a remote server.")
+	}
+
+	return nil
+}
+
 func SetupRootCommand(cmd *cobra.Command) {
 	// Common commands
 	cmd.AddCommand(AutoCompleteCmd)
@@ -240,7 +277,7 @@ func PreRun(rootCmd *cobra.Command, args []string, telemetryEnabled bool, client
 			props["called_as"] = os.Args[1]
 			err := telemetryService.TrackCliEvent(telemetry.CliEventInvalidCmd, clientId, props)
 			if err != nil {
-				log.Error(err)
+				log.Trace(err)
 			}
 			telemetryService.Close()
 		}
@@ -251,7 +288,7 @@ func PreRun(rootCmd *cobra.Command, args []string, telemetryEnabled bool, client
 	if telemetryEnabled {
 		err := telemetryService.TrackCliEvent(telemetry.CliEventCmdStart, clientId, GetCmdTelemetryData(cmd, flags))
 		if err != nil {
-			log.Error(err)
+			log.Trace(err)
 		}
 
 		go func() {
@@ -267,7 +304,7 @@ func PreRun(rootCmd *cobra.Command, args []string, telemetryEnabled bool, client
 
 				err := telemetryService.TrackCliEvent(telemetry.CliEventCmdEnd, clientId, props)
 				if err != nil {
-					log.Error(err)
+					log.Trace(err)
 				}
 				telemetryService.Close()
 				os.Exit(0)
@@ -289,7 +326,7 @@ func PostRun(cmd *cobra.Command, cmdErr error, telemetryService telemetry.Teleme
 
 		err := telemetryService.TrackCliEvent(telemetry.CliEventCmdEnd, clientId, props)
 		if err != nil {
-			log.Error(err)
+			log.Trace(err)
 		}
 		telemetryService.Close()
 	}

pkg/cmd/gitprovider/delete.go

@@ -8,7 +8,7 @@ import (
 
 	apiclient_util "github.com/daytonaio/daytona/internal/util/apiclient"
 	"github.com/daytonaio/daytona/pkg/views"
-	gitprovider_view "github.com/daytonaio/daytona/pkg/views/gitprovider"
+	"github.com/daytonaio/daytona/pkg/views/workspace/selection"
 	"github.com/spf13/cobra"
 )
 
@@ -46,10 +46,7 @@ var gitProviderDeleteCmd = &cobra.Command{
 			return nil
 		}
 
-		selectedGitProvider, err := gitprovider_view.GetGitProviderFromPrompt(ctx, gitProviders, apiClient)
-		if err != nil {
-			return err
-		}
+		selectedGitProvider := selection.GetGitProviderConfigFromPrompt(gitProviders, false, "Remove")
 
 		if selectedGitProvider == nil {
 			return nil