From 2f95288046eb1e2d76d4b7b470411a75d6d7f6dd Mon Sep 17 00:00:00 2001 From: Jeff Haynie Date: Fri, 23 May 2025 11:07:52 -0500 Subject: [PATCH 1/3] Dont prompt for env on devmode, remove old server flag now that it comes from API --- cmd/dev.go | 18 ------------------ internal/dev/server.go | 6 ------ 2 files changed, 24 deletions(-) diff --git a/cmd/dev.go b/cmd/dev.go index aaa13880..fb7a17bf 100644 --- a/cmd/dev.go +++ b/cmd/dev.go @@ -6,13 +6,11 @@ import ( "io" "os" "os/signal" - "strings" "syscall" "time" "github.com/agentuity/cli/internal/bundler" "github.com/agentuity/cli/internal/dev" - "github.com/agentuity/cli/internal/envutil" "github.com/agentuity/cli/internal/errsystem" "github.com/agentuity/cli/internal/project" "github.com/agentuity/cli/internal/util" @@ -67,12 +65,6 @@ Examples: errsystem.New(errsystem.ErrInvalidConfiguration, err, errsystem.WithUserMessage("Failed to validate project (%s) using the provided API key from the .env file in %s. This is most likely due to the API key being invalid or the project has been deleted.\n\nYou can import this project using the following command:\n\n"+tui.Command("project import"), theproject.Project.ProjectId, dir), errsystem.WithContextMessage(fmt.Sprintf("Failed to get project: %s", err))).ShowErrorAndExit() } - force, _ := cmd.Flags().GetBool("force") - if !tui.HasTTY { - force = true - } - _, project = envutil.ProcessEnvFiles(ctx, log, dir, theproject.Project, project, theproject.APIURL, apiKey, force) - orgId := project.OrgId port, _ := cmd.Flags().GetInt("port") @@ -81,12 +73,6 @@ Examples: log.Fatal("failed to find available port: %s", err) } - serverAddr, _ := cmd.Flags().GetString("server") - - if strings.Contains(apiUrl, "agentuity.io") && !strings.Contains(serverAddr, "localhost") { - serverAddr = "localhost:12001" - } - server, err := dev.New(dev.ServerArgs{ Ctx: ctx, Logger: log, @@ -99,7 +85,6 @@ Examples: Version: Version, UserId: userId, Port: port, - ServerAddr: serverAddr, }) if err != nil { log.Fatal("failed to create live dev connection: %s", err) @@ -281,7 +266,4 @@ func init() { rootCmd.AddCommand(devCmd) devCmd.Flags().StringP("dir", "d", ".", "The directory to run the development server in") devCmd.Flags().Int("port", 0, "The port to run the development server on (uses project default if not provided)") - devCmd.Flags().String("server", "echo.agentuity.cloud", "the echo server to connect to") - devCmd.Flags().MarkHidden("server") - devCmd.Flags().Bool("force", false, "Force the processing of environment files") } diff --git a/internal/dev/server.go b/internal/dev/server.go index 4c32422c..dd147199 100644 --- a/internal/dev/server.go +++ b/internal/dev/server.go @@ -62,7 +62,6 @@ type Server struct { tlsCertificate *tls.Certificate conn *tls.Conn wg sync.WaitGroup - serverAddr string cleanup func() // Connection state @@ -86,7 +85,6 @@ type ServerArgs struct { UserId string Version string Port int - ServerAddr string } type ConnectionResponse struct { @@ -214,9 +212,6 @@ func (s *Server) connect(initial bool) { tlsConfig.NextProtos = []string{"h2"} hostname := s.hostname - if hostname == "" { - hostname = s.serverAddr - } if strings.Contains(hostname, "localhost") || strings.Contains(hostname, "127.0.0.1") { tlsConfig.InsecureSkipVerify = true @@ -626,7 +621,6 @@ func New(args ServerArgs) (*Server, error) { apiclient: util.NewAPIClient(context.Background(), pendingLogger, args.APIURL, args.APIKey), pendingLogger: pendingLogger, connected: make(chan string, 1), - serverAddr: args.ServerAddr, } go server.connect(true) From 9818ee6cfab0bc5825e71e2019f5eef7b6c550d3 Mon Sep 17 00:00:00 2001 From: Jeff Haynie Date: Fri, 23 May 2025 11:10:05 -0500 Subject: [PATCH 2/3] update new discord links --- README.md | 2 +- cmd/root.go | 2 +- internal/dev/tui.go | 2 +- internal/errsystem/console.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index d3f0e665..7a0dae4e 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@
Release version License -Join the community on Discord +Join the community on Discord diff --git a/cmd/root.go b/cmd/root.go index 91972a53..f4e2f084 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -58,7 +58,7 @@ Dashboard: %s`, tui.Muted("Build, manage and deploy AI agents"), Version, tui.Link("https://agentuity.dev"), - tui.Link("https://discord.gg/vtn3hgUfuc"), + tui.Link("https://discord.gg/agentuity"), tui.Link("https://app.agentuity.com"), )) }, diff --git a/internal/dev/tui.go b/internal/dev/tui.go index 7bd18587..a7671d1d 100644 --- a/internal/dev/tui.go +++ b/internal/dev/tui.go @@ -355,7 +355,7 @@ func (m *model) View() string { "", "", tui.Warning("To get help or share your feedback, join our Discord community:"), "", - tui.Link("https://discord.gg/vtn3hgUfuc"), + tui.Link("https://discord.gg/agentuity"), "", ) } else if m.selectedLog != nil { diff --git a/internal/errsystem/console.go b/internal/errsystem/console.go index d2e194c2..72437625 100644 --- a/internal/errsystem/console.go +++ b/internal/errsystem/console.go @@ -24,7 +24,7 @@ import ( var Version string = "dev" const baseDocURL = "https://agentuity.dev/errors/%s" -const discordURL = "https://discord.gg/vtn3hgUfuc" +const discordURL = "https://discord.gg/agentuity" type crashReport struct { ID string `json:"id"` From b291e736eed4b579f9615fdeb2323b1ce504307f Mon Sep 17 00:00:00 2001 From: Jeff Haynie Date: Fri, 23 May 2025 11:36:08 -0500 Subject: [PATCH 3/3] fix weird formatting on env question --- cmd/dev.go | 3 +++ go.mod | 2 +- go.sum | 4 ++-- internal/envutil/envutil.go | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/cmd/dev.go b/cmd/dev.go index fb7a17bf..ed6ef7a6 100644 --- a/cmd/dev.go +++ b/cmd/dev.go @@ -11,6 +11,7 @@ import ( "github.com/agentuity/cli/internal/bundler" "github.com/agentuity/cli/internal/dev" + "github.com/agentuity/cli/internal/envutil" "github.com/agentuity/cli/internal/errsystem" "github.com/agentuity/cli/internal/project" "github.com/agentuity/cli/internal/util" @@ -65,6 +66,8 @@ Examples: errsystem.New(errsystem.ErrInvalidConfiguration, err, errsystem.WithUserMessage("Failed to validate project (%s) using the provided API key from the .env file in %s. This is most likely due to the API key being invalid or the project has been deleted.\n\nYou can import this project using the following command:\n\n"+tui.Command("project import"), theproject.Project.ProjectId, dir), errsystem.WithContextMessage(fmt.Sprintf("Failed to get project: %s", err))).ShowErrorAndExit() } + _, project = envutil.ProcessEnvFiles(ctx, log, dir, theproject.Project, project, theproject.APIURL, apiKey, false) + orgId := project.OrgId port, _ := cmd.Flags().GetInt("port") diff --git a/go.mod b/go.mod index 1c33eb25..4ae3e5a1 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.24.2 require ( github.com/Masterminds/semver v1.5.0 - github.com/agentuity/go-common v1.0.60 + github.com/agentuity/go-common v1.0.64 github.com/agentuity/mcp-golang/v2 v2.0.2 github.com/bep/debounce v1.2.1 github.com/bmatcuk/doublestar/v4 v4.8.1 diff --git a/go.sum b/go.sum index 9d42fe23..9d98738e 100644 --- a/go.sum +++ b/go.sum @@ -9,8 +9,8 @@ github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERo github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/ProtonMail/go-crypto v1.1.5 h1:eoAQfK2dwL+tFSFpr7TbOaPNUbPiJj4fLYwwGE1FQO4= github.com/ProtonMail/go-crypto v1.1.5/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE= -github.com/agentuity/go-common v1.0.60 h1:r9uLZrYnNasnVxsTGju7ktP9+A5D3j13ald8H3Z7AMQ= -github.com/agentuity/go-common v1.0.60/go.mod h1:cy1EPYpZUkp3JSMgTb+Sa3sLnS7vQQupj/RwO4An6L4= +github.com/agentuity/go-common v1.0.64 h1:E7PRLFcrPDd32doxSzI2reCpaHtHr3mcSmVl9yz+Ffc= +github.com/agentuity/go-common v1.0.64/go.mod h1:cy1EPYpZUkp3JSMgTb+Sa3sLnS7vQQupj/RwO4An6L4= github.com/agentuity/mcp-golang/v2 v2.0.2 h1:wZqS/aHWZsQoU/nd1E1/iMsVY2dywWT9+PFlf+3YJxo= github.com/agentuity/mcp-golang/v2 v2.0.2/go.mod h1:U105tZXyTatxxOBlcObRgLb/ULvGgT2DJ1nq/8++P6Q= github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8= diff --git a/internal/envutil/envutil.go b/internal/envutil/envutil.go index 065e81b6..9d3cc0f9 100644 --- a/internal/envutil/envutil.go +++ b/internal/envutil/envutil.go @@ -176,7 +176,8 @@ func HandleMissingProjectEnvs(ctx context.Context, logger logger.Logger, le []en suffix = "them" title = fmt.Sprintf("There are %d environment variables from %s that are not set in the project.", len(keyvalue), tui.Bold(".env")) } - force = tui.Ask(logger, title+"\nWould you like to set "+suffix+" now?", true) + fmt.Println(title) + force = tui.Ask(logger, "Would you like to set "+suffix+" now?", true) } if force { for key, val := range keyvalue {