From 94185e2257e32879e4aaaeb7e8b5736469f245f4 Mon Sep 17 00:00:00 2001
From: orca-bug-scan-bot <orca-bug-scan-bot@stably.ai>
Date: Mon, 8 Jun 2026 12:58:13 -0700
Subject: [PATCH] fix: address pr-bug-scan validated finding from #4891

C1: refreshDevices catch early-returns when liveTargetRef set, sparing live preview. C2: attach catch only suppresses auto-attach for emulator_simctl_unavailable, so transient errors auto-recover.
---
 .../emulator-pane/use-emulator-pane-session.ts    | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/renderer/src/components/emulator-pane/use-emulator-pane-session.ts b/src/renderer/src/components/emulator-pane/use-emulator-pane-session.ts
index 9e2a867e6ae..35065736d25 100644
--- a/src/renderer/src/components/emulator-pane/use-emulator-pane-session.ts
+++ b/src/renderer/src/components/emulator-pane/use-emulator-pane-session.ts
@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useRef, useState } from 'react'
-import { callRuntimeRpc } from '@/runtime/runtime-rpc-client'
+import { callRuntimeRpc, RuntimeRpcCallError } from '@/runtime/runtime-rpc-client'
 import { useAppStore } from '@/store'
 import {
   deviceLabel,
@@ -76,6 +76,12 @@ export function useEmulatorPaneSession({
       }
       return next
     } catch (error) {
+      // Why: a transient post-attach refresh failure must not clobber a live
+      // preview — emptying the dropdown and showing an error banner over a
+      // working stream. Only surface the error when no session is live.
+      if (liveTargetRef.current) {
+        return []
+      }
       deviceRefreshErrorRef.current = error
       if (mountedRef.current) {
         setDevices([])
@@ -202,8 +208,11 @@ export function useEmulatorPaneSession({
           return
         }
         // Why: setup failures otherwise trigger the mount auto-attach loop again
-        // and erase the actionable error before the user can read it.
-        suppressAutoAttachRef.current = true
+        // and erase the actionable error before the user can read it. Only setup
+        // failures suppress auto-attach — a transient blip must still auto-recover.
+        if (e instanceof RuntimeRpcCallError && e.code === 'emulator_simctl_unavailable') {
+          suppressAutoAttachRef.current = true
+        }
         const msg = emulatorPaneErrorMessage(
           e,
           'Could not start the emulator. Check that Xcode is installed and try another device.'