fix(desktop-browser): keep error-page focus recovery inside the browser and route hard reload through recovery

Author: waleedlatif1

apps/desktop/src/main/browser-agent/session.ts

@@ -2012,6 +2012,20 @@ export function reloadPage(contents: WebContents): void {
   contents.reload()
 }
 
+/**
+ * Reloads past the HTTP cache, the browser's Shift-reload. A page showing an
+ * issue takes the same recovery as a plain reload instead: a hung renderer
+ * must be restarted, since reloading it in place waits on the hung page.
+ */
+function hardReloadPage(contents: WebContents): void {
+  if (tabForContents(contents)?.pageIssue) {
+    reloadPage(contents)
+    return
+  }
+  prepareExplicitNavigation(contents)
+  contents.reloadIgnoringCache()
+}
+
 /** Hands one page selection to the exact app window and chat hosting its tab. */
 function addPageSelectionToChat(contents: WebContents, text: string): void {
   if (!text.trim() || getBrowserScopeId() !== getActiveBrowserScopeId()) return
@@ -2494,8 +2508,7 @@ function initializeTabView(
         return
       }
       if (shortcut === 'hard-reload') {
-        prepareExplicitNavigation(contents)
-        contents.reloadIgnoringCache()
+        hardReloadPage(contents)
         return
       }
 
@@ -3512,8 +3525,7 @@ export function handleFocusedShortcut(
       reloadPage(shortcutTab.view.webContents)
       return true
     case 'hard-reload':
-      prepareExplicitNavigation(shortcutTab.view.webContents)
-      shortcutTab.view.webContents.reloadIgnoringCache()
+      hardReloadPage(shortcutTab.view.webContents)
       return true
     case 'back':
       goBack(shortcutTab.view.webContents)

apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-find-bar.tsx

@@ -142,7 +142,7 @@ export function BrowserFindBar({ inputRef, onClose, scopeId }: BrowserFindBarPro
           // The panel and the global command layer both listen for these.
           event.stopPropagation()
           // Keys during an IME composition edit the composed text.
-          if (event.nativeEvent.isComposing) return
+          if (event.nativeEvent.isComposing || event.nativeEvent.keyCode === 229) return
           if (event.key === 'Escape') {
             event.preventDefault()
             dismiss()

apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-page-issue.tsx

@@ -1,4 +1,4 @@
-import { useEffect, useRef } from 'react'
+import { type RefObject, useEffect, useRef } from 'react'
 import type { BrowserPageIssue } from '@sim/browser-protocol'
 import { Chip } from '@sim/emcn'
 import { CircleAlert, Globe, RefreshCw } from '@sim/emcn/icons'
@@ -7,6 +7,8 @@ interface BrowserPageIssueProps {
   issue: BrowserPageIssue
   onReload: () => void
   focusRecovery: boolean
+  /** The browser panel; focus anywhere else in Sim is never taken for recovery. */
+  panelRef: RefObject<HTMLElement | null>
 }
 
 interface BrowserPageIssueCopy {
@@ -125,29 +127,31 @@ export function browserPageIssueCopy(issue: BrowserPageIssue): BrowserPageIssueC
   }
 }
 
-function isEditingOutside(heading: HTMLElement | null): boolean {
+/**
+ * Whether the user's focus is somewhere in Sim other than the browser.
+ * `document.activeElement` survives a window blur, so a caret left in chat
+ * still counts as elsewhere.
+ */
+function isFocusElsewhere(panel: HTMLElement | null): boolean {
   const active = document.activeElement
-  // activeElement survives a window blur, so a caret left in chat still counts.
-  if (!(active instanceof HTMLElement)) return false
-  const section = heading?.closest('section')
-  if (section?.contains(active)) return false
-  return (
-    active.isContentEditable ||
-    active instanceof HTMLInputElement ||
-    active instanceof HTMLTextAreaElement
-  )
+  if (!(active instanceof HTMLElement) || active === document.body) return false
+  return !panel?.contains(active)
 }
 
 /** Replaces a hidden native page and optionally claims renderer focus for keyboard recovery. */
-export function BrowserPageIssueView({ issue, onReload, focusRecovery }: BrowserPageIssueProps) {
+export function BrowserPageIssueView({
+  issue,
+  onReload,
+  focusRecovery,
+  panelRef,
+}: BrowserPageIssueProps) {
   const headingRef = useRef<HTMLHeadingElement>(null)
   const copy = browserPageIssueCopy(issue)
 
   useEffect(() => {
-    // Keyboard recovery for someone who was in the page; a caret in chat or
-    // any other Sim field stays where it is.
-    if (focusRecovery && !isEditingOutside(headingRef.current)) headingRef.current?.focus()
-  }, [focusRecovery, issue])
+    // Keyboard recovery for someone who was in the browser.
+    if (focusRecovery && !isFocusElsewhere(panelRef.current)) headingRef.current?.focus()
+  }, [focusRecovery, issue, panelRef])
 
   const Icon = issue.kind === 'load-error' ? Globe : CircleAlert
 

apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-session.tsx

@@ -1157,7 +1157,7 @@ export function BrowserSession({
                   onKeyDown={(event) => {
                     event.stopPropagation()
                     // Keys during an IME composition edit the composed text, not the URL.
-                    if (event.nativeEvent.isComposing) return
+                    if (event.nativeEvent.isComposing || event.nativeEvent.keyCode === 229) return
                     if (event.key === 'ArrowDown' || event.key === 'ArrowUp') {
                       // Never move a highlight through a list that is not on screen.
                       if (!suggestionsOpen) return
@@ -1359,6 +1359,7 @@ export function BrowserSession({
           <BrowserPageIssueView
             issue={pageState.issue}
             focusRecovery={visible}
+            panelRef={panelRef}
             onReload={() => sendBrowserPanelAction('reload', {}, scopeId)}
           />
         )}