fix: parse models as object map and retry on empty list

Author: jacobjmc

src-tauri/src/main.rs

@@ -1,9 +1,15 @@
 // Prevents additional console window on Windows in release, DO NOT REMOVE!!
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
+use std::thread;
+
 fn main() {
-    if let Err(err) = fix_path_env::fix() {
-        eprintln!("Failed to sync PATH from shell: {err}");
-    }
+    // Sync PATH from shell in background - don't block app launch
+    thread::spawn(|| {
+        if let Err(err) = fix_path_env::fix() {
+            eprintln!("Failed to sync PATH from shell: {err}");
+        }
+    });
+
     opencode_monitor_lib::run()
 }

src-tauri/src/shared/codex_core.rs

@@ -831,12 +831,13 @@ pub(crate) async fn model_list_core(
         }
     };
 
-    // REST returns { providers: [{ id, models: [{ id, name }] }], default: { ... } }.
-    let default_config = providers.get("default").cloned().unwrap_or(json!({}));
-    let default_model = default_config
-        .as_object()
-        .and_then(|m| m.values().next())
-        .and_then(|v| v.as_str())
+    // REST returns:
+    //   providers: [{ id, models: { "model-id": { id, name, ... }, ... } }]
+    //   default:   { "provider-id": "model-id", ... }
+    let defaults = providers
+        .get("default")
+        .and_then(|v| v.as_object())
+        .cloned()
         .unwrap_or_default();
 
     let provider_list = providers
@@ -851,12 +852,17 @@ pub(crate) async fn model_list_core(
             .get("id")
             .and_then(|v| v.as_str())
             .unwrap_or_default();
-        let models = provider
+        let default_for_provider = defaults
+            .get(provider_id)
+            .and_then(|v| v.as_str())
+            .unwrap_or_default();
+        // `models` is a map { "model-id": { id, name, ... } }, not an array.
+        let models_map = provider
             .get("models")
-            .and_then(|v| v.as_array())
+            .and_then(|v| v.as_object())
             .cloned()
             .unwrap_or_default();
-        for model in models {
+        for (_key, model) in &models_map {
             let model_id = model
                 .get("id")
                 .and_then(|v| v.as_str())
@@ -873,7 +879,7 @@ pub(crate) async fn model_list_core(
                 .trim()
                 .to_string();
             let qualified_id = format!("{provider_id}/{model_id}");
-            let is_default = qualified_id == default_model || model_id == default_model;
+            let is_default = model_id == default_for_provider;
             data.push(json!({
                 "id": qualified_id,
                 "model": model_id,

src/features/models/hooks/useModels.ts

@@ -312,6 +312,45 @@ export function useModels({
     return unsub;
   }, [isConnected, refreshModels, workspaceId]);
 
+  // Retry loading models when connected but the list is empty.
+  // The initial fetch may return empty if the OpenCode server hasn't finished
+  // starting, and the codex/modelsReady event may fire before the frontend
+  // subscribes — leaving models stuck at "Loading models..." with no trigger
+  // to retry.
+  useEffect(() => {
+    if (!workspaceId || !isConnected || models.length > 0) {
+      return;
+    }
+    let cancelled = false;
+    let attempts = 0;
+    let timerId: ReturnType<typeof setTimeout>;
+    const MAX_ATTEMPTS = 10;
+    const BASE_DELAY = 1500;
+    const MAX_DELAY = 15_000;
+
+    const scheduleRetry = () => {
+      if (cancelled || attempts >= MAX_ATTEMPTS) {
+        return;
+      }
+      const delay = Math.min(BASE_DELAY * Math.pow(2, attempts), MAX_DELAY);
+      attempts += 1;
+      timerId = setTimeout(() => {
+        if (cancelled) {
+          return;
+        }
+        refreshModels();
+        scheduleRetry();
+      }, delay);
+    };
+
+    scheduleRetry();
+
+    return () => {
+      cancelled = true;
+      clearTimeout(timerId);
+    };
+  }, [workspaceId, isConnected, models.length, refreshModels]);
+
   useEffect(() => {
     if (!selectedModel) {
       return;