From 85cc7b8a9dba40e8cbb71488c8660a1ccfc1a2ef Mon Sep 17 00:00:00 2001
From: Kayvan Sylvan <kayvan@sylvan.com>
Date: Mon, 17 Mar 2025 15:09:36 -0700
Subject: [PATCH] fix: improve error handling in ChangeDefaultModel flow and
 save environment file

- Add early return on setup error
- Save environment file after successful setup
- Maintain proper error propagation
---
 cli/cli.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cli/cli.go b/cli/cli.go
index b4b7893a..5dd21281 100644
--- a/cli/cli.go
+++ b/cli/cli.go
@@ -73,7 +73,10 @@ func Cli(version string) (err error) {
 	}
 
 	if currentFlags.ChangeDefaultModel {
-		err = registry.Defaults.Setup()
+		if err = registry.Defaults.Setup(); err != nil {
+			return
+		}
+		err = registry.SaveEnvFile()
 		return
 	}