fix(desktop-browser): align recovery interaction paths

Author: waleedlatif1

apps/desktop/src/main/browser-agent/driver.test.ts

@@ -455,6 +455,14 @@ describe('executeTool', () => {
     vi.mocked(contents.loadURL).mockClear()
     await driver.handlePanelAction('chat-test', { action: 'reload' })
     expect(contents.loadURL).toHaveBeenCalledWith(failedUrl)
+
+    vi.mocked(contents.loadURL).mockClear()
+    await driver.executeTool('chat-test', 'browser_go_back', {})
+    expect(session.pageIssueForContents(contents)).toBeUndefined()
+    expect(session.canGoForward(contents)).toBe(true)
+
+    await driver.executeTool('chat-test', 'browser_go_forward', {})
+    expect(contents.loadURL).toHaveBeenCalledWith(failedUrl)
   })
 
   it('forces fill availability to replay on scope activation and tab switches', async () => {

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

@@ -1985,19 +1985,20 @@ async function executeToolInner(
     case 'browser_go_forward': {
       invalidateSnapshot()
       const contents = session.requireAutomationTab().view.webContents
-      const history = contents.navigationHistory
       assertCurrentExecution()
       let completion: Promise<void>
       if (tool === 'browser_go_back') {
-        if (!history.canGoBack()) throw new ToolError('Cannot go back — no earlier history entry.')
+        if (!session.canGoBack(contents)) {
+          throw new ToolError('Cannot go back — no earlier history entry.')
+        }
         completion = waitForLoadComplete(contents, NAVIGATION_TIMEOUT_MS)
-        history.goBack()
+        session.goBack(contents)
       } else {
-        if (!history.canGoForward()) {
+        if (!session.canGoForward(contents)) {
           throw new ToolError('Cannot go forward — no later history entry.')
         }
         completion = waitForLoadComplete(contents, NAVIGATION_TIMEOUT_MS)
-        history.goForward()
+        session.goForward(contents)
       }
       return await navigationResult(contents, completion)
     }

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

@@ -90,6 +90,7 @@ describe('browserPageIssueCopy', () => {
             url: 'http://localhost:3004',
           },
           onReload,
+          focusRecovery: true,
         })
       )
     })
@@ -105,4 +106,28 @@ describe('browserPageIssueCopy', () => {
     act(() => root.unmount())
     container.remove()
   })
+
+  it('does not move focus when its browser resource is hidden', () => {
+    const container = document.createElement('div')
+    const sentinel = document.createElement('button')
+    document.body.append(container, sentinel)
+    sentinel.focus()
+    const root = createRoot(container)
+
+    act(() => {
+      root.render(
+        createElement(BrowserPageIssueView, {
+          issue: { kind: 'unresponsive', url: 'https://example.com' },
+          onReload: vi.fn(),
+          focusRecovery: false,
+        })
+      )
+    })
+
+    expect(document.activeElement).toBe(sentinel)
+
+    act(() => root.unmount())
+    container.remove()
+    sentinel.remove()
+  })
 })

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

@@ -6,6 +6,7 @@ import { CircleAlert, Globe, RefreshCw } from '@sim/emcn/icons'
 interface BrowserPageIssueProps {
   issue: BrowserPageIssue
   onReload: () => void
+  focusRecovery: boolean
 }
 
 interface BrowserPageIssueCopy {
@@ -124,13 +125,14 @@ export function browserPageIssueCopy(issue: BrowserPageIssue): BrowserPageIssueC
   }
 }
 
-export function BrowserPageIssueView({ issue, onReload }: BrowserPageIssueProps) {
+/** Replaces a hidden native page and optionally claims renderer focus for keyboard recovery. */
+export function BrowserPageIssueView({ issue, onReload, focusRecovery }: BrowserPageIssueProps) {
   const headingRef = useRef<HTMLHeadingElement>(null)
   const copy = browserPageIssueCopy(issue)
 
   useEffect(() => {
-    headingRef.current?.focus()
-  }, [issue])
+    if (focusRecovery) headingRef.current?.focus()
+  }, [focusRecovery, issue])
 
   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

@@ -932,8 +932,11 @@ export function BrowserSession({
   // Keep the page's exact captured frame underneath it while it is open so
   // pointer events reach the Sim popover instead of the WebContentsView.
   useEffect(() => {
+    if (hasPageIssue) {
+      void closeOverlay('suggestions')
+      return
+    }
     if (suggestions.length > 0) {
-      if (hasPageIssue) return
       void requestOverlay('suggestions', () => {})
       return
     }
@@ -1446,6 +1449,7 @@ export function BrowserSession({
         {pageState?.issue && (
           <BrowserPageIssueView
             issue={pageState.issue}
+            focusRecovery={visible}
             onReload={() => sendBrowserPanelAction('reload', {}, scopeId)}
           />
         )}