From 0a32fb899f808a5fa91472b4e8c066bdbace8d9f Mon Sep 17 00:00:00 2001
From: nesquena-hermes <agent@nesquena-hermes>
Date: Sat, 27 Jun 2026 04:33:02 +0000
Subject: [PATCH] fix(onboarding): rehydrate plain-select fallback so saved
 model isn't reset to option[0]
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Codex gate finding on #5031: when _mountSearchableModelSelect is absent the
fallback returns the old plain <select>, but the post-render rehydration
(modelSel.value = ONBOARDING.form.model) was removed — so a saved/default model
that isn't the first option would be silently replaced by option[0] on render.
Restore the rehydration in an else branch + add a regression test.

Co-authored-by: rodboev <rodboev@users.noreply.github.com>
---
 static/onboarding.js                           |  6 ++++++
 tests/test_issue1362_codex_oauth_onboarding.py | 14 ++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/static/onboarding.js b/static/onboarding.js
index cc395066..d75e9d48 100644
--- a/static/onboarding.js
+++ b/static/onboarding.js
@@ -369,6 +369,12 @@ function _renderOnboardingBody(){
         selectedValue:ONBOARDING.form.model,
         onModelChange:(value)=>{ ONBOARDING.form.model=(value||'').trim(); },
       });
+    }else{
+      // Fallback path (searchable picker unavailable): rehydrate the plain
+      // <select> so a saved/default model that isn't the first option isn't
+      // silently replaced by option[0] on render.
+      const modelSel=$('onboardingModelSelect');
+      if(modelSel && ONBOARDING.form.model) modelSel.value=ONBOARDING.form.model;
     }
     return;
   }
diff --git a/tests/test_issue1362_codex_oauth_onboarding.py b/tests/test_issue1362_codex_oauth_onboarding.py
index ef0a7c71..2b9b69bb 100644
--- a/tests/test_issue1362_codex_oauth_onboarding.py
+++ b/tests/test_issue1362_codex_oauth_onboarding.py
@@ -611,6 +611,20 @@ def test_onboarding_non_custom_provider_mounts_searchable_model_picker():
     assert "customInputId:'onboardingModelInput'" in js
 
 
+def test_onboarding_plain_select_fallback_rehydrates_saved_model():
+    """When the searchable picker helper is unavailable, the plain <select>
+    fallback must still rehydrate ONBOARDING.form.model so a saved/default
+    model that isn't the first option isn't silently replaced by option[0]."""
+    js = (REPO / "static" / "onboarding.js").read_text(encoding="utf-8")
+    # The mount block must have an else branch that restores the plain select value.
+    mount_idx = js.find("if(modelPickerRoot && typeof _mountSearchableModelSelect")
+    assert mount_idx != -1
+    after_mount = js[mount_idx:mount_idx + 900]
+    assert "}else{" in after_mount or "} else {" in after_mount
+    assert "const modelSel=$('onboardingModelSelect')" in after_mount
+    assert "modelSel.value=ONBOARDING.form.model" in after_mount
+
+
 def test_onboarding_custom_provider_text_input_branch_stays_intact():
     js = (REPO / "static" / "onboarding.js").read_text(encoding="utf-8")
     assert "ONBOARDING.form.provider==='custom'" in js