fix: set common UI env vars regardless of whether a file is passed

Signed-off-by: Donnie Adams <[email protected]>

Author: thedadams

pkg/cli/gptscript.go

@@ -334,6 +334,18 @@ func (r *GPTScript) Run(cmd *cobra.Command, args []string) (retErr error) {
 	if r.UI {
 		args = append([]string{uiTool()}, args...)
 
+		if os.Getenv(system.BinEnvVar) == "" {
+			gptOpt.Env = append(gptOpt.Env, system.BinEnvVar+"="+system.Bin())
+		}
+
+		// Pass the corrected environment variables for SDK server options
+		if r.DefaultModel != "" {
+			gptOpt.Env = append(gptOpt.Env, "GPTSCRIPT_SDKSERVER_DEFAULT_MODEL="+r.DefaultModel)
+		}
+		if len(r.CredentialOverride) > 0 {
+			gptOpt.Env = append(gptOpt.Env, "GPTSCRIPT_SDKSERVER_CREDENTIAL_OVERRIDE="+strings.Join(r.CredentialOverride, ","))
+		}
+
 		// If args has more than one element, then the user has provided a file.
 		if len(args) > 1 {
 			if args[1] == "-" {
@@ -359,23 +371,7 @@ func (r *GPTScript) Run(cmd *cobra.Command, args []string) (retErr error) {
 				gptOpt.Env = append(gptOpt.Env, "SCRIPTS_PATH="+cwd)
 			}
 
-			if os.Getenv(system.BinEnvVar) == "" {
-				gptOpt.Env = append(gptOpt.Env, system.BinEnvVar+"="+system.Bin())
-			}
-
-			// Pass the corrected environment variables for SDK server options
-			if r.DefaultModel != "" {
-				gptOpt.Env = append(gptOpt.Env, "GPTSCRIPT_SDKSERVER_DEFAULT_MODEL="+r.DefaultModel)
-			}
-			if len(r.CredentialOverride) > 0 {
-				gptOpt.Env = append(gptOpt.Env, "GPTSCRIPT_SDKSERVER_CREDENTIAL_OVERRIDE="+strings.Join(r.CredentialOverride, ","))
-			}
-
 			gptOpt.Env = append(gptOpt.Env, "UI_RUN_FILE="+file)
-
-			if len(args) > 2 {
-				args = append(args, args[2:]...)
-			}
 		} else {
 			cwd, err := os.Getwd()
 			if err != nil {