CLI Agent

pkgs/defang/cli.nix

@@ -7,7 +7,7 @@ buildGo124Module {
   pname = "defang-cli";
   version = "git";
   src = lib.cleanSource ../../src;
-  vendorHash = "sha256-me/fzAIa1ONgn/9rn13zd2kujzuqrCvbBaAmoqjL90c="; # TODO: use fetchFromGitHub
+  vendorHash = "sha256-sD/pczoX98Z+DgaLVCADwu4qWiGnNjlebKDOKjV2HnU="; # TODO: use fetchFromGitHub
 
   subPackages = [ "cmd/cli" ];
 

src/cmd/cli/command/commands.go

@@ -15,13 +15,15 @@ import (
 
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/DefangLabs/defang/src/pkg"
+	"github.com/DefangLabs/defang/src/pkg/agent"
 	"github.com/DefangLabs/defang/src/pkg/cli"
 	cliClient "github.com/DefangLabs/defang/src/pkg/cli/client"
 	"github.com/DefangLabs/defang/src/pkg/cli/client/byoc"
 	"github.com/DefangLabs/defang/src/pkg/cli/client/byoc/gcp"
 	"github.com/DefangLabs/defang/src/pkg/cli/compose"
 	"github.com/DefangLabs/defang/src/pkg/clouds/aws"
 	pcluster "github.com/DefangLabs/defang/src/pkg/cluster"
+	"github.com/DefangLabs/defang/src/pkg/debug"
 	"github.com/DefangLabs/defang/src/pkg/dryrun"
 	"github.com/DefangLabs/defang/src/pkg/login"
 	"github.com/DefangLabs/defang/src/pkg/logs"
@@ -392,6 +394,23 @@ var RootCmd = &cobra.Command{
 
 		return err
 	},
+	RunE: func(cmd *cobra.Command, args []string) error {
+		if nonInteractive {
+			return nil
+		}
+
+		ctx := cmd.Context()
+		err := login.InteractiveRequireLoginAndToS(ctx, client, getCluster())
+		if err != nil {
+			return err
+		}
+		prompt := "Welcome to Defang. I can help you deploy your project to the cloud"
+		ag, err := agent.New(ctx, getCluster(), &providerID, agent.DefaultSystemPrompt)
+		if err != nil {
+			return err
+		}
+		return ag.StartWithUserPrompt(ctx, prompt)
+	},
 }
 
 var loginCmd = &cobra.Command{
@@ -838,6 +857,7 @@ var debugCmd = &cobra.Command{
 	Hidden:      true,
 	Short:       "Debug a build, deployment, or service failure",
 	RunE: func(cmd *cobra.Command, args []string) error {
+		ctx := cmd.Context()
 		etag, _ := cmd.Flags().GetString("etag")
 		deployment, _ := cmd.Flags().GetString("deployment")
 		since, _ := cmd.Flags().GetString("since")
@@ -848,12 +868,17 @@ var debugCmd = &cobra.Command{
 		}
 
 		loader := configureLoader(cmd)
-		provider, err := newProviderChecked(cmd.Context(), loader)
+		_, err := newProviderChecked(ctx, loader)
 		if err != nil {
 			return err
 		}
 
-		project, err := loader.LoadProject(cmd.Context())
+		project, err := loader.LoadProject(ctx)
+		if err != nil {
+			return err
+		}
+
+		debugger, err := debug.NewDebugger(ctx, getCluster(), &providerID)
 		if err != nil {
 			return err
 		}
@@ -868,16 +893,15 @@ var debugCmd = &cobra.Command{
 			return fmt.Errorf("invalid 'until' time: %w", err)
 		}
 
-		debugConfig := cli.DebugConfig{
+		debugConfig := debug.DebugConfig{
 			Deployment:     deployment,
 			FailedServices: args,
-			ModelId:        modelId,
 			Project:        project,
-			Provider:       provider,
+			ProviderID:     &providerID,
 			Since:          sinceTs.UTC(),
 			Until:          untilTs.UTC(),
 		}
-		return cli.DebugDeployment(cmd.Context(), client, debugConfig)
+		return debugger.DebugDeployment(ctx, debugConfig)
 	},
 }
 

src/cmd/cli/command/compose.go

@@ -15,6 +15,7 @@ import (
 	cliClient "github.com/DefangLabs/defang/src/pkg/cli/client"
 	"github.com/DefangLabs/defang/src/pkg/cli/client/byoc"
 	"github.com/DefangLabs/defang/src/pkg/cli/compose"
+	"github.com/DefangLabs/defang/src/pkg/debug"
 	"github.com/DefangLabs/defang/src/pkg/dryrun"
 	"github.com/DefangLabs/defang/src/pkg/logs"
 	"github.com/DefangLabs/defang/src/pkg/modes"
@@ -55,6 +56,7 @@ func makeComposeUpCmd() *cobra.Command {
 			loader := configureLoader(cmd)
 
 			ctx := cmd.Context()
+
 			project, loadErr := loader.LoadProject(ctx)
 			if loadErr != nil {
 				if nonInteractive {
@@ -67,8 +69,13 @@ func makeComposeUpCmd() *cobra.Command {
 					return err
 				}
 
-				track.Evt("Debug Prompted", P("loadErr", loadErr))
-				return cli.InteractiveDebugForClientError(ctx, client, project, loadErr)
+				debugger, err := debug.NewDebugger(ctx, getCluster(), &providerID)
+				if err != nil {
+					return err
+				}
+				return debugger.DebugComposeLoadError(ctx, debug.DebugConfig{
+					Project: project,
+				}, loadErr)
 			}
 
 			provider, err := newProviderChecked(ctx, loader)
@@ -136,7 +143,11 @@ func makeComposeUpCmd() *cobra.Command {
 				Mode:       mode,
 			})
 			if err != nil {
-				return handleComposeUpErr(ctx, err, project, provider)
+				debugger, err := debug.NewDebugger(ctx, getCluster(), &providerID)
+				if err != nil {
+					return err
+				}
+				return handleComposeUpErr(ctx, debugger, project, provider, err)
 			}
 
 			if len(deploy.Services) == 0 {
@@ -160,14 +171,19 @@ func makeComposeUpCmd() *cobra.Command {
 			tailOptions := newTailOptionsForDeploy(deploy.Etag, since, verbose)
 			serviceStates, err := cli.TailAndMonitor(ctx, project, provider, time.Duration(waitTimeout)*time.Second, tailOptions)
 			if err != nil {
-				handleTailAndMonitorErr(ctx, err, client, cli.DebugConfig{
+				deploymentErr := err
+				debugger, err := debug.NewDebugger(ctx, getCluster(), &providerID)
+				if err != nil {
+					return err
+				}
+				handleTailAndMonitorErr(ctx, deploymentErr, debugger, debug.DebugConfig{
 					Deployment: deploy.Etag,
-					ModelId:    modelId,
 					Project:    project,
-					Provider:   provider,
 					Since:      since,
+					Until:      time.Now(),
+					ProviderID: &providerID,
 				})
-				return err
+				return deploymentErr
 			}
 
 			for _, service := range deploy.Services {
@@ -199,7 +215,7 @@ func makeComposeUpCmd() *cobra.Command {
 	return composeUpCmd
 }
 
-func handleComposeUpErr(ctx context.Context, err error, project *compose.Project, provider cliClient.Provider) error {
+func handleComposeUpErr(ctx context.Context, debugger *debug.Debugger, project *compose.Project, provider cliClient.Provider, err error) error {
 	if errors.Is(err, types.ErrComposeFileNotFound) {
 		// TODO: generate a compose file based on the current project
 		printDefangHint("To start a new project, do:", "new")
@@ -225,29 +241,32 @@ func handleComposeUpErr(ctx context.Context, err error, project *compose.Project
 	}
 
 	term.Error("Error:", cliClient.PrettyError(err))
-	track.Evt("Debug Prompted", P("composeErr", err))
-	return cli.InteractiveDebugForClientError(ctx, client, project, err)
+	return debugger.DebugComposeLoadError(ctx, debug.DebugConfig{
+		Project: project,
+	}, err)
 }
 
-func handleTailAndMonitorErr(ctx context.Context, err error, client *cliClient.GrpcClient, debugConfig cli.DebugConfig) {
+func handleTailAndMonitorErr(ctx context.Context, err error, debugger *debug.Debugger, debugConfig debug.DebugConfig) {
 	var errDeploymentFailed cliClient.ErrDeploymentFailed
 	if errors.As(err, &errDeploymentFailed) {
 		// Tail got canceled because of deployment failure: prompt to show the debugger
 		term.Warn(errDeploymentFailed)
 		if errDeploymentFailed.Service != "" {
 			debugConfig.FailedServices = []string{errDeploymentFailed.Service}
 		}
+
 		if nonInteractive {
 			printDefangHint("To debug the deployment, do:", debugConfig.String())
-		} else {
-			track.Evt("Debug Prompted", P("failedServices", debugConfig.FailedServices), P("etag", debugConfig.Deployment), P("reason", errDeploymentFailed))
+			return
+		}
 
-			// Call the AI debug endpoint using the original command context (not the tail ctx which is canceled)
-			if nil != cli.InteractiveDebugDeployment(ctx, client, debugConfig) {
-				// don't show this defang hint if debugging was successful
-				tailOptions := newTailOptionsForDeploy(debugConfig.Deployment, debugConfig.Since, true)
-				printDefangHint("To see the logs of the failed service, run:", "logs "+tailOptions.String())
-			}
+		track.Evt("Debug Prompted", P("failedServices", debugConfig.FailedServices), P("etag", debugConfig.Deployment), P("reason", errDeploymentFailed))
+
+		// Call the AI debug endpoint using the original command context (not the tail ctx which is canceled)
+		if nil != debugger.DebugDeployment(ctx, debugConfig) {
+			// don't show this defang hint if debugging was successful
+			tailOptions := newTailOptionsForDeploy(debugConfig.Deployment, debugConfig.Since, true)
+			printDefangHint("To see the logs of the failed service, run:", "logs "+tailOptions.String())
 		}
 	}
 }
@@ -448,8 +467,13 @@ func makeComposeConfigCmd() *cobra.Command {
 					return err
 				}
 
-				track.Evt("Debug Prompted", P("loadErr", loadErr))
-				return cli.InteractiveDebugForClientError(ctx, client, project, loadErr)
+				debugger, err := debug.NewDebugger(ctx, getCluster(), &providerID)
+				if err != nil {
+					return err
+				}
+				return debugger.DebugComposeLoadError(ctx, debug.DebugConfig{
+					Project: project,
+				}, loadErr)
 			}
 
 			provider, err := newProvider(ctx, loader)