From 6dd751c6174901663e9716d178df157e95d38931 Mon Sep 17 00:00:00 2001
From: Amit Singh <amitksingh1490@gmail.com>
Date: Mon, 6 Apr 2026 20:19:15 +0530
Subject: [PATCH] fix(ui): allow model selection when provider activation
 completes without selection

---
 crates/forge_main/src/ui.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/crates/forge_main/src/ui.rs b/crates/forge_main/src/ui.rs
index 3b0ab93991..223c892e1c 100644
--- a/crates/forge_main/src/ui.rs
+++ b/crates/forge_main/src/ui.rs
@@ -2088,7 +2088,13 @@ impl<A: API + ConsoleWriter + 'static, F: Fn(ForgeConfig) -> A + Send + Sync> UI
             if !self.on_provider_selection().await? {
                 return Ok(None);
             }
-            return Ok(None);
+
+            // Provider activation may have already completed model selection.
+            // If it did not, continue below and show the full cross-provider
+            // model list.
+            if self.api.get_default_model().await.is_some() {
+                return Ok(None);
+            }
         }
 
         // Fetch models from ALL configured providers (matches shell plugin's