address PR comments

Author: kinseydurhamgrace

cli/cmd/engine-cli/main.go

@@ -273,17 +273,20 @@ func runEngine(cmd *cobra.Command, args []string) error {
 	}
 
 	env := runner.Environment{
-		JobID:           jobID,
-		APIToken:        githubToken,
-		APIURL:          apiURL,
-		JobNonce:        mockServer.Nonce(),
-		InferenceToken:  githubToken,
-		InferenceURL:    inferenceURL,
-		GitToken:        githubToken,
-		SelectedEngine:  selectedEngine,
-		SelectedModel:   selectedModel,
-		DefaultModel:    defaultModel,
-		AvailableModels: availableModels,
+		JobID:          jobID,
+		APIToken:       githubToken,
+		APIURL:         apiURL,
+		JobNonce:       mockServer.Nonce(),
+		InferenceToken: githubToken,
+		InferenceURL:   inferenceURL,
+		GitToken:       githubToken,
+	}
+
+	if enableModelSelection {
+		env.SelectedEngine = selectedEngine
+		env.SelectedModel = selectedModel
+		env.DefaultModel = defaultModel
+		env.AvailableModels = availableModels
 	}
 
 	result := runner.Run(ctx, command, env, runner.Options{WorkingDir: workingDir}, runnerCallbacks)

src/client.ts

@@ -540,18 +540,21 @@ export function resolveSelectedModel(
     options?: ResolveSelectedModelOptions,
 ): string | undefined {
     // Model selection must be explicitly enabled via feature flag
-    if (!job.features?.model_selection) {
+    if (job.features?.model_selection !== true) {
         return undefined;
     }
 
-    const availableModels = job.available_models?.filter((model) => model.trim().length > 0) ?? [];
+    const availableModels = job.available_models
+        ?.map((model) => model.trim())
+        .filter((model) => model.length > 0) ?? [];
 
     const candidates = [
         options?.preferredModel,
         job.selected_model,
         job.default_model,
         options?.fallbackModel,
-    ].filter((model): model is string => Boolean(model && model.trim().length > 0));
+    ].map((model) => model?.trim())
+     .filter((model): model is string => Boolean(model && model.length > 0));
 
     if (availableModels.length === 0) {
         return candidates[0];