enable ANSI on Windows

src/cmd/cli/command/commands.go

@@ -45,7 +45,7 @@ var (
 	provider       = cliClient.Provider(pkg.Getenv("DEFANG_PROVIDER", "auto"))
 )
 
-func Execute(ctx context.Context) {
+func Execute(ctx context.Context) error {
 	if err := RootCmd.ExecuteContext(ctx); err != nil {
 		if !errors.Is(err, context.Canceled) {
 			term.Error("Error:", err)
@@ -84,8 +84,7 @@ func Execute(ctx context.Context) {
 			printDefangHint("Please use the following command to see the Defang terms of service:", "terms")
 		}
 
-		FlushAllTracking() // TODO: track errors/panics
-		os.Exit(int(code))
+		return ExitCode(code)
 	}
 
 	if hasTty && term.HadWarnings {
@@ -101,7 +100,7 @@ func Execute(ctx context.Context) {
 			}
 		}
 	}
-
+	return nil
 }
 
 func SetupCommands() {
@@ -248,10 +247,14 @@ var RootCmd = &cobra.Command{
 
 		// Do this first, since any errors will be printed to the console
 		switch colorMode {
-		case ColorAlways:
-			term.ForceColor(true)
 		case ColorNever:
 			term.ForceColor(false)
+		case ColorAlways:
+			term.ForceColor(true)
+			fallthrough
+		default:
+			restore := term.EnableANSI()
+			cobra.OnFinalize(restore)
 		}
 
 		switch provider {

src/cmd/cli/command/exitcode.go

@@ -0,0 +1,9 @@
+package command
+
+import "fmt"
+
+type ExitCode int
+
+func (e ExitCode) Error() string {
+	return fmt.Sprintf("exit code %d", e)
+}

src/cmd/cli/main.go

@@ -20,11 +20,19 @@ func main() {
 		signal.Stop(sigs)
 		term.Debug("Received interrupt signal; cancelling...")
 		command.Track("User Interrupted")
-		command.FlushAllTracking()
 		cancel()
 	}()
 
 	command.SetupCommands()
-	command.Execute(ctx)
-	command.FlushAllTracking()
+	err := command.Execute(ctx)
+	command.FlushAllTracking() // TODO: track errors/panics
+
+	if err != nil {
+		// If the error is a command.ExitCode, use its value as the exit code
+		ec, ok := err.(command.ExitCode)
+		if !ok {
+			ec = 1 // should not happen since we always return ExitCode
+		}
+		os.Exit(int(ec))
+	}
 }

src/pkg/local/local.go

@@ -1,3 +1,6 @@
+//go:build !windows
+// +build !windows
+
 package local
 
 import (

src/pkg/local/local_test.go

@@ -1,3 +1,6 @@
+//go:build !windows
+// +build !windows
+
 package local
 
 import (

src/pkg/term/colorizer.go

@@ -9,7 +9,7 @@ import (
 )
 
 var (
-	IsTerminal  = term.IsTerminal(int(os.Stdout.Fd())) && term.IsTerminal(int(os.Stdin.Fd())) && os.Getenv("TERM") != ""
+	IsTerminal  = term.IsTerminal(int(os.Stdout.Fd())) && term.IsTerminal(int(os.Stdin.Fd())) && isTerminal()
 	Stdout      = termenv.NewOutput(os.Stdout)
 	Stderr      = termenv.NewOutput(os.Stderr)
 	CanColor    = doColor(Stdout)

src/pkg/term/colorizer_other.go

@@ -0,0 +1,14 @@
+//go:build !windows
+// +build !windows
+
+package term
+
+import "os"
+
+func EnableANSI() func() {
+	return func() {}
+}
+
+func isTerminal() bool {
+	return os.Getenv("TERM") != ""
+}

src/pkg/term/colorizer_test.go

@@ -30,3 +30,8 @@ func TestOutput(t *testing.T) {
 	}
 	// Output(Stdout, InfoColor, "Hello, World!")
 }
+
+func TestEnableANSI(t *testing.T) {
+	restore := EnableANSI()
+	restore()
+}

src/pkg/term/colorizer_windows.go

@@ -0,0 +1,22 @@
+//go:build windows
+// +build windows
+
+package term
+
+import (
+	"github.com/muesli/termenv"
+)
+
+func EnableANSI() func() {
+	mode, err := termenv.EnableWindowsANSIConsole()
+	if err != nil {
+		return func() {}
+	}
+	return func() {
+		termenv.RestoreWindowsConsole(mode)
+	}
+}
+
+func isTerminal() bool {
+	return true
+}