From 764bd71f69bad786364e0e67a2e9c00ac489343c Mon Sep 17 00:00:00 2001
From: mayank2498 <mayank.c@browserstack.com>
Date: Mon, 25 May 2026 14:49:20 +0530
Subject: [PATCH 1/2] fix(applive): quit button must detach, not delete session

Customer hit a stuck-on-loader state when reopening Appium Inspector
in the same AppLive session after Quit. Root cause: the X button
called quitSession() with no args, which sent DELETE /session and
killed the WebDriver session AppLive depends on. In AppLive context
(window.AppLiveSessionId truthy), the button must detach only.

Desktop Inspector behavior is unchanged.

Refs AL-13652, AL-13970. RCA: docs/post-prod-bugs/001-quit-restart-stuck.md
---
 .../components/SessionInspector/Header/HeaderButtons.jsx  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/common/renderer/components/SessionInspector/Header/HeaderButtons.jsx b/app/common/renderer/components/SessionInspector/Header/HeaderButtons.jsx
index 87b2fd5a2b..ea76c2a521 100644
--- a/app/common/renderer/components/SessionInspector/Header/HeaderButtons.jsx
+++ b/app/common/renderer/components/SessionInspector/Header/HeaderButtons.jsx
@@ -316,7 +316,13 @@ const HeaderButtons = (props) => {
         </Tooltip>
       )}
       <Tooltip title={t('Quit Session')}>
-        <Button id="btnClose" icon={<IconX size={18} />} onClick={quitSessionAndReturn} />
+        <Button
+          id="btnClose"
+          icon={<IconX size={18} />}
+          onClick={() =>
+            quitSessionAndReturn(window.AppLiveSessionId ? {detachOnly: true} : undefined)
+          }
+        />
       </Tooltip>
     </Space.Compact>
   );

From 2d96fe7817c5cd5bb449cd2ae81cbc771baf2f9a Mon Sep 17 00:00:00 2001
From: mayank2498 <mayank.c@browserstack.com>
Date: Mon, 25 May 2026 15:10:48 +0530
Subject: [PATCH 2/2] fix(session-builder): tolerate non-array res.value from
 sessions endpoints
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Some Appium/Selenium servers — observed on the BrowserStack hub after
a session is deleted — return {value: {error: 'unknown command', ...}}
from /appium/sessions. That non-iterable object propagated into a
Promise.all + spread, threw TypeError, and silently emptied the
running-sessions list, breaking auto-attach, the manual session
dropdown, and restart.

Refs AL-13652, AL-13970.
---
 app/common/renderer/actions/SessionBuilder.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/common/renderer/actions/SessionBuilder.js b/app/common/renderer/actions/SessionBuilder.js
index 4e1d8b9205..544d6ad218 100644
--- a/app/common/renderer/actions/SessionBuilder.js
+++ b/app/common/renderer/actions/SessionBuilder.js
@@ -812,7 +812,13 @@ async function fetchAllSessions(baseUrl, headers) {
   async function fetchSessionsFromEndpoint(url) {
     try {
       const res = await fetchSessionInformation({url, headers});
-      return url === seleniumSessionsEndpoint ? formatSeleniumGridSessions(res) : (res.value ?? []);
+      const value = url === seleniumSessionsEndpoint
+        ? formatSeleniumGridSessions(res)
+        : (res.value ?? []);
+      // Some Appium servers return `{value: {error: "unknown command", ...}}` from these
+      // endpoints — a non-iterable object — which used to throw on the spread below and
+      // silently empty the session list. Treat any non-array as "no sessions".
+      return Array.isArray(value) ? value : [];
     } catch {
       return [];
     }