Skip to content

armgit / orca

Public Imported from GitHub
0

Orca is the place for working with a fleet of agents (e.g. Grok Bot, Claude Code). Run any coding agent with your own subscription. Available on desktop, mobile and remote runtime.

fix(browser): find a hidden tab on the first agent command after a window reload (#36307)

Kelvin Amoaba5c2bfed94839
diff --git a/src/main/browser/agent-browser-bridge-lifecycle.ts b/src/main/browser/agent-browser-bridge-lifecycle.ts
index 0a5ec29ec4e..5e40960ceda 100644
--- a/src/main/browser/agent-browser-bridge-lifecycle.ts
+++ b/src/main/browser/agent-browser-bridge-lifecycle.ts
@@ -4,6 +4,7 @@ import { ORCA_TAB_SESSION_PREFIX } from './agent-browser-orphan-sweep'
import { AgentBrowserBridgeRawProcess } from './agent-browser-bridge-raw-process'
import type { AgentBrowserCleanupOptions } from './agent-browser-bridge-types'
import { AGENT_BROWSER_CLEANUP_TIMEOUT_MS } from './agent-browser-bridge-types'
+import { waitForAgentBrowserSessionExit } from './agent-browser-session-reset'
import { runOutsideRemoteCliBrowserScope } from '../runtime/desktop-browser-bridge/remote-cli-browser-scope'
export abstract class AgentBrowserBridgeLifecycle extends AgentBrowserBridgeRawProcess {
@@ -80,9 +81,18 @@ export abstract class AgentBrowserBridgeLifecycle extends AgentBrowserBridgeRawP
}
this.assertCommandAdmission()
- if (this.sessions.has(sessionName)) {
+ const existing = this.sessions.get(sessionName)
+ if (existing?.webContentsId === webContentsId) {
return
}
+ if (existing) {
+ // A renderer reload gives the page a new guest without a process-swap notice.
+ await this.destroySession(sessionName, {
+ closeTimeoutMs: AGENT_BROWSER_CLEANUP_TIMEOUT_MS,
+ keepQueuedCommands: true
+ })
+ this.assertCommandAdmission()
+ }
// Coalesce creation to avoid leaking duplicate proxies and debugger connections.
const pending = this.pendingSessionCreation.get(sessionName)
@@ -191,6 +201,11 @@ export abstract class AgentBrowserBridgeLifecycle extends AgentBrowserBridgeRawP
['--session', sessionName, 'close'],
options.closeTimeoutMs === undefined ? undefined : { timeoutMs: options.closeTimeoutMs }
)
+ await waitForAgentBrowserSessionExit({
+ ownsSocketDirectory: this.ownsAgentBrowserSocketDirectory,
+ socketDirectory: this.agentBrowserEnv.AGENT_BROWSER_SOCKET_DIR,
+ sessionName
+ })
} catch {}
await session.proxy.stop()
diff --git a/src/main/browser/agent-browser-bridge-session-lifecycle.test.ts b/src/main/browser/agent-browser-bridge-session-lifecycle.test.ts
index 1eee2a3fc01..05f82570b99 100644
--- a/src/main/browser/agent-browser-bridge-session-lifecycle.test.ts
+++ b/src/main/browser/agent-browser-bridge-session-lifecycle.test.ts
@@ -328,6 +328,51 @@ describe('AgentBrowserBridge', () => {
)
})
+ it('moves a reload-replaced page to a new daemon only after the old one exits', async () => {
+ const tabs = new Map([['tab-1', 100]])
+ const b = new AgentBrowserBridge(mockBrowserManager(tabs))
+ Object.assign(b, {
+ ownsAgentBrowserSocketDirectory: true,
+ agentBrowserEnv: { AGENT_BROWSER_SOCKET_DIR: '/tmp/orca-ab-test' }
+ })
+ let daemon: 'none' | 'up' | 'exiting' = 'none'
+ const commandsSentToExitingDaemon: string[] = []
+ lstatSyncMock.mockImplementation(() => {
+ if (daemon === 'none') {
+ throw Object.assign(new Error('No socket'), { code: 'ENOENT' })
+ }
+ return {}
+ })
+ answerAgentBrowserCommands(execFileMock, stdinWrites, (command, cb) => {
+ if (command[0] === 'close') {
+ // agent-browser answers close, then exits and removes its socket about 100 ms later.
+ daemon = 'exiting'
+ setTimeout(() => (daemon = 'none'), 50)
+ } else {
+ if (daemon === 'exiting') {
+ commandsSentToExitingDaemon.push(command[0])
+ }
+ daemon = 'up'
+ }
+ cb(null, JSON.stringify({ success: true, data: { snapshot: 'tree' } }), '')
+ })
+ webContentsFromIdMock.mockImplementation((id: number) =>
+ id === 100 ? mockWebContents(100) : null
+ )
+ await b.snapshot(undefined, 'tab-1')
+
+ // The reload destroyed guest 100 and unregistered it, so the new guest has nothing to swap from.
+ tabs.set('tab-1', 200)
+ webContentsFromIdMock.mockImplementation((id: number) =>
+ id === 200 ? mockWebContents(200) : null
+ )
+ await b.snapshot(undefined, 'tab-1')
+
+ expect(CdpWsProxyMock.mock.lastCall?.[0]).toMatchObject({ id: 200 })
+ expect(closeCallCount()).toBe(1)
+ expect(commandsSentToExitingDaemon).toEqual([])
+ })
+
it('rejects commands queued behind a running command when the page swaps guests', async () => {
const tabs = new Map([['tab-1', 100]])
const b = new AgentBrowserBridge(mockBrowserManager(tabs))
diff --git a/src/main/browser/agent-browser-session-reset.ts b/src/main/browser/agent-browser-session-reset.ts
index a3e0c3106d0..45f97c032b7 100644
--- a/src/main/browser/agent-browser-session-reset.ts
+++ b/src/main/browser/agent-browser-session-reset.ts
@@ -22,3 +22,21 @@ export function canSkipAgentBrowserSessionReset(options: {
return (error as NodeJS.ErrnoException).code === 'ENOENT'
}
}
+
+const DAEMON_EXIT_WAIT_MS = 1_000
+const DAEMON_EXIT_POLL_MS = 25
+
+/** agent-browser answers `close`, then exits and removes its socket ~100 ms later; a command sent meanwhile reaches the dying daemon. */
+export async function waitForAgentBrowserSessionExit(options: {
+ ownsSocketDirectory: boolean
+ socketDirectory: string | undefined
+ sessionName: string
+}): Promise<void> {
+ if (!options.ownsSocketDirectory) {
+ return
+ }
+ const deadline = Date.now() + DAEMON_EXIT_WAIT_MS
+ while (!canSkipAgentBrowserSessionReset(options) && Date.now() < deadline) {
+ await new Promise((resolve) => setTimeout(resolve, DAEMON_EXIT_POLL_MS))
+ }
+}
diff --git a/src/main/browser/extensions/browser-extension-main-window-readiness.ts b/src/main/browser/browser-main-window-readiness.ts
similarity index 74%
rename from src/main/browser/extensions/browser-extension-main-window-readiness.ts
rename to src/main/browser/browser-main-window-readiness.ts
index 34c496181d9..95d2d99cbb8 100644
--- a/src/main/browser/extensions/browser-extension-main-window-readiness.ts
+++ b/src/main/browser/browser-main-window-readiness.ts
@@ -1,5 +1,5 @@
import type { BrowserWindow } from 'electron'
-import { forgetBrowserPageGuestsGone } from './browser-extension-discarded-tabs'
+import { forgetBrowserPageGuestsGone } from './extensions/browser-extension-discarded-tabs'
/** Sent by the renderer's browser request bridge once its workspaces are restored. */
const TAB_REQUESTS_READY_CHANNEL = 'browser:tabRequestsReady'
@@ -10,10 +10,11 @@ const waiters = new Set<(window: BrowserWindow | null) => void>()
/**
* Follows whether Orca's main window can take browser tab requests. Extensions open tabs from
- * the moment they load, before the window exists or its renderer listens; a request sent then is
- * dropped and times out. Each renderer document says it is ready once, so a reload resets this.
+ * the moment they load, and agent commands wake hidden tabs right after a reload, before the
+ * renderer listens or has restored its tabs; a request sent then is dropped and times out. Each
+ * renderer document says it is ready once, so a reload resets this.
*/
-export function watchBrowserExtensionMainWindowReadiness(window: BrowserWindow): void {
+export function watchBrowserMainWindowReadiness(window: BrowserWindow): void {
watchedWindow = window
readyWindow = null
const contents = window.webContents
@@ -38,9 +39,7 @@ export function watchBrowserExtensionMainWindowReadiness(window: BrowserWindow):
}
/** The main window once its renderer takes tab requests; null if that takes over `timeoutMs`. */
-export function whenBrowserExtensionMainWindowReady(
- timeoutMs: number
-): Promise<BrowserWindow | null> {
+export function whenBrowserMainWindowReady(timeoutMs: number): Promise<BrowserWindow | null> {
if (readyWindow && !readyWindow.isDestroyed()) {
return Promise.resolve(readyWindow)
}
diff --git a/src/main/browser/extensions/browser-extension-tab-model.test.ts b/src/main/browser/extensions/browser-extension-tab-model.test.ts
index 16a6174ac92..f52de442a3a 100644
--- a/src/main/browser/extensions/browser-extension-tab-model.test.ts
+++ b/src/main/browser/extensions/browser-extension-tab-model.test.ts
@@ -46,15 +46,14 @@ vi.mock('./browser-extension-window-model', () => ({
const { openBrowserExtensionTab, recentWorktreeIdForBrowserProfile, recordActiveBrowserPage } =
await import('./browser-extension-tab-model')
-const { watchBrowserExtensionMainWindowReadiness } =
- await import('./browser-extension-main-window-readiness')
+const { watchBrowserMainWindowReadiness } = await import('../browser-main-window-readiness')
/** Orca's main window; its renderer reports readiness on the per-window IPC channel. */
function mainWindow() {
const contents = Object.assign(new EventEmitter(), { ipc: new EventEmitter() })
const window = { id: 1, webContents: contents, isDestroyed: () => false }
// oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: readiness reads only id, isDestroyed and these two emitters.
- watchBrowserExtensionMainWindowReadiness(window as unknown as Electron.BrowserWindow)
+ watchBrowserMainWindowReadiness(window as unknown as Electron.BrowserWindow)
return {
rendererReady: () => contents.ipc.emit('browser:tabRequestsReady'),
reload: () => contents.emit('did-navigate')
diff --git a/src/main/browser/extensions/browser-extension-tab-model.ts b/src/main/browser/extensions/browser-extension-tab-model.ts
index 9e11cea4701..6329b623c38 100644
--- a/src/main/browser/extensions/browser-extension-tab-model.ts
+++ b/src/main/browser/extensions/browser-extension-tab-model.ts
@@ -21,7 +21,7 @@ import {
getBrowserExtensionSessionForProfile
} from './browser-extension-session-loader'
import { isBrowserExtensionSupportEnabled } from './browser-extension-support'
-import { whenBrowserExtensionMainWindowReady } from './browser-extension-main-window-readiness'
+import { whenBrowserMainWindowReady } from '../browser-main-window-readiness'
import { findDiscardedBrowserTabForPage } from './browser-extension-discarded-tabs'
import {
getBrowserExtensionMainWindow,
@@ -296,7 +296,7 @@ export async function openBrowserExtensionTab(
): Promise<number> {
const profile = getBrowserExtensionProfile(browserProfileId)
// Why wait: extensions open tabs as they load (onInstalled), before Orca's window can take them.
- const mainWindow = profile ? await whenBrowserExtensionMainWindowReady(MAIN_WINDOW_WAIT_MS) : null
+ const mainWindow = profile ? await whenBrowserMainWindowReady(MAIN_WINDOW_WAIT_MS) : null
if (!mainWindow || !profile) {
throw new BrowserExtensionApiError('Orca has no window to open a tab in')
}
diff --git a/src/main/browser/extensions/browser-extension-tab-resolution.test.ts b/src/main/browser/extensions/browser-extension-tab-resolution.test.ts
index fab09993a89..396d2d89836 100644
--- a/src/main/browser/extensions/browser-extension-tab-resolution.test.ts
+++ b/src/main/browser/extensions/browser-extension-tab-resolution.test.ts
@@ -85,7 +85,7 @@ vi.mock('./browser-extension-api-host', () => ({ emitBrowserExtensionEvent: vi.f
vi.mock('./browser-extension-popup-host', () => ({ closeBrowserExtensionPopup: vi.fn() }))
vi.mock('./browser-extension-support', () => ({ isBrowserExtensionSupportEnabled: () => false }))
vi.mock('./browser-extension-session-loader', () => ({}))
-vi.mock('./browser-extension-main-window-readiness', () => ({}))
+vi.mock('../browser-main-window-readiness', () => ({}))
vi.mock('./browser-extension-active-tab', () => ({
hasBrowserExtensionActiveTab: (_extensionId: string, tabId: number) =>
mocks.activeGrants.has(tabId)
diff --git a/src/main/browser/extensions/browser-extension-window-model.test.ts b/src/main/browser/extensions/browser-extension-window-model.test.ts
index d4d3a66f8cb..110d3cc0fe9 100644
--- a/src/main/browser/extensions/browser-extension-window-model.test.ts
+++ b/src/main/browser/extensions/browser-extension-window-model.test.ts
@@ -35,8 +35,8 @@ vi.mock('./browser-extension-api-host', () => ({
mocks.emitted.push({ session: target.session, event })
}))
vi.mock('./browser-extension-support', () => ({ isBrowserExtensionSupportEnabled: () => false }))
-vi.mock('./browser-extension-main-window-readiness', () => ({
- watchBrowserExtensionMainWindowReadiness: () => {}
+vi.mock('../browser-main-window-readiness', () => ({
+ watchBrowserMainWindowReadiness: () => {}
}))
const { BrowserWindow } = await import('electron')
diff --git a/src/main/browser/extensions/browser-extension-window-model.ts b/src/main/browser/extensions/browser-extension-window-model.ts
index 1b94bce2e13..d0d17d8f306 100644
--- a/src/main/browser/extensions/browser-extension-window-model.ts
+++ b/src/main/browser/extensions/browser-extension-window-model.ts
@@ -7,7 +7,7 @@ import {
showWindowWithoutStealingFocus
} from '../../window/foreground-activation-policy'
import { emitBrowserExtensionEvent } from './browser-extension-api-host'
-import { watchBrowserExtensionMainWindowReadiness } from './browser-extension-main-window-readiness'
+import { watchBrowserMainWindowReadiness } from '../browser-main-window-readiness'
/** chrome.windows constants. */
export const WINDOW_ID_NONE = -1
@@ -87,7 +87,7 @@ function watchWindowEvents(
*/
export function trackBrowserExtensionMainWindow(window: BrowserWindow): void {
mainWindow = window
- watchBrowserExtensionMainWindowReadiness(window)
+ watchBrowserMainWindowReadiness(window)
watchWindowEvents(window, undefined, () => {
if (mainWindow === window) {
mainWindow = null
diff --git a/src/main/runtime/browser-tab-create-publication.test.ts b/src/main/runtime/browser-tab-create-publication.test.ts
index 404bf767066..4a0d3dc0a9f 100644
--- a/src/main/runtime/browser-tab-create-publication.test.ts
+++ b/src/main/runtime/browser-tab-create-publication.test.ts
@@ -32,6 +32,10 @@ vi.mock('../ipc/browser-tab-registration-wait', () => ({
waitForWorktreeTabRegistration: vi.fn()
}))
+vi.mock('../browser/browser-main-window-readiness', () => ({
+ whenBrowserMainWindowReady: async () => null
+}))
+
vi.mock('../browser/browser-session-registry', () => ({
browserSessionRegistry: {
getDefaultProfile: () => ({ id: 'default', partition: 'persist:orca-browser' }),
diff --git a/src/main/runtime/browser/browser-command-targets.ts b/src/main/runtime/browser/browser-command-targets.ts
index 18891bf6d47..3668b7801e2 100644
--- a/src/main/runtime/browser/browser-command-targets.ts
+++ b/src/main/runtime/browser/browser-command-targets.ts
@@ -5,6 +5,7 @@ import {
waitForTabRegistration,
waitForWorktreeTabRegistration
} from '../../ipc/browser-tab-registration-wait'
+import { whenBrowserMainWindowReady } from '../../browser/browser-main-window-readiness'
import type { BrowserSnapshotResult } from '../../../shared/runtime-types'
import type {
BrowserCommandTargetParams,
@@ -13,6 +14,8 @@ import type {
ResolvedBrowserPageWebContents
} from './browser-command-contracts'
+const MAIN_WINDOW_READY_WAIT_MS = 8_000
+
export class RuntimeBrowserCommandTargets {
constructor(
private readonly host: Pick<
@@ -155,8 +158,7 @@ export class RuntimeBrowserCommandTargets {
if (this.host.serveBrowserTabs?.hasStartable(worktreeId) === false) {
return
}
- const win = this.host.getAuthoritativeWindow()
- win.webContents.send('browser:activateView', worktreeId ? { worktreeId } : {})
+ await this.sendActivateView(worktreeId ? { worktreeId } : {})
// Await registerGuest rather than guessing a fixed mount delay.
await waitForWorktreeTabRegistration(worktreeId)
}
@@ -168,14 +170,20 @@ export class RuntimeBrowserCommandTargets {
if (await this.host.serveBrowserTabs?.start(worktreeId, browserPageId)) {
return
}
- const win = this.host.getAuthoritativeWindow()
- win.webContents.send(
- 'browser:activateView',
- worktreeId ? { worktreeId, browserPageId } : { browserPageId }
- )
+ await this.sendActivateView(worktreeId ? { worktreeId, browserPageId } : { browserPageId })
await waitForTabRegistration(browserPageId)
}
+ // A reloaded renderer drops activateView until it has restored the tab to mount.
+ private async sendActivateView(payload: {
+ worktreeId?: string
+ browserPageId?: string
+ }): Promise<void> {
+ const win = this.host.getAuthoritativeWindow()
+ await whenBrowserMainWindowReady(MAIN_WINDOW_READY_WAIT_MS)
+ win.webContents.send('browser:activateView', payload)
+ }
+
// Automation may bypass Electron navigation events; publish authoritative URL/title updates.
notifyRendererNavigation(browserPageId: string, url: string, title: string): void {
try {
diff --git a/src/main/runtime/orca-runtime-browser-client-hosted.test.ts b/src/main/runtime/orca-runtime-browser-client-hosted.test.ts
index c81941aa463..4c724f22429 100644
--- a/src/main/runtime/orca-runtime-browser-client-hosted.test.ts
+++ b/src/main/runtime/orca-runtime-browser-client-hosted.test.ts
@@ -39,6 +39,10 @@ vi.mock('../ipc/browser-tab-registration-wait', () => ({
waitForWorktreeTabRegistration: vi.fn()
}))
+vi.mock('../browser/browser-main-window-readiness', () => ({
+ whenBrowserMainWindowReady: async () => null
+}))
+
vi.mock('../browser/browser-session-registry', () => ({
browserSessionRegistry: browserSessionRegistryMock
}))
diff --git a/src/main/runtime/orca-runtime-browser-headless.test.ts b/src/main/runtime/orca-runtime-browser-headless.test.ts
index 82c244a092e..a628623141a 100644
--- a/src/main/runtime/orca-runtime-browser-headless.test.ts
+++ b/src/main/runtime/orca-runtime-browser-headless.test.ts
@@ -54,6 +54,10 @@ vi.mock('../ipc/browser-tab-registration-wait', () => ({
waitForWorktreeTabRegistration: waitForWorktreeTabRegistrationMock
}))
+vi.mock('../browser/browser-main-window-readiness', () => ({
+ whenBrowserMainWindowReady: async () => null
+}))
+
vi.mock('../browser/browser-session-registry', () => ({
browserSessionRegistry: browserSessionRegistryMock
}))
diff --git a/src/main/runtime/orca-runtime-browser.test.ts b/src/main/runtime/orca-runtime-browser.test.ts
index c3f23a989c2..e439c7f09e9 100644
--- a/src/main/runtime/orca-runtime-browser.test.ts
+++ b/src/main/runtime/orca-runtime-browser.test.ts
@@ -11,6 +11,7 @@ const {
startBrowserScreencastMock,
waitForTabRegistrationMock,
waitForWorktreeTabRegistrationMock,
+ whenBrowserMainWindowReadyMock,
browserSessionRegistryMock
} = vi.hoisted(() => ({
ipcMainOnMock: vi.fn(),
@@ -19,6 +20,7 @@ const {
startBrowserScreencastMock: vi.fn(),
waitForTabRegistrationMock: vi.fn(),
waitForWorktreeTabRegistrationMock: vi.fn(),
+ whenBrowserMainWindowReadyMock: vi.fn(),
browserSessionRegistryMock: {
profiles: new Map([
[
@@ -63,6 +65,10 @@ vi.mock('../ipc/browser-tab-registration-wait', () => ({
waitForWorktreeTabRegistration: waitForWorktreeTabRegistrationMock
}))
+vi.mock('../browser/browser-main-window-readiness', () => ({
+ whenBrowserMainWindowReady: whenBrowserMainWindowReadyMock
+}))
+
vi.mock('../browser/browser-session-registry', () => ({
browserSessionRegistry: browserSessionRegistryMock
}))
@@ -119,6 +125,8 @@ describe('RuntimeBrowserCommands browser screencast', () => {
waitForTabRegistrationMock.mockResolvedValue(undefined)
waitForWorktreeTabRegistrationMock.mockReset()
waitForWorktreeTabRegistrationMock.mockResolvedValue(undefined)
+ whenBrowserMainWindowReadyMock.mockReset()
+ whenBrowserMainWindowReadyMock.mockResolvedValue(null)
browserSessionRegistryMock.getDefaultProfile.mockReset()
browserSessionRegistryMock.getDefaultProfile.mockImplementation(() =>
browserSessionRegistryMock.profiles.get('default')
@@ -499,6 +507,36 @@ describe('RuntimeBrowserCommands browser screencast', () => {
expect(snapshot).toHaveBeenCalledWith('wt-1', 'page-target')
})
+ it('wakes a hidden page only once a reloaded renderer can mount it', async () => {
+ const { RuntimeBrowserCommands } = await import('./browser/browser-commands')
+ const rendererReady = deferred<null>()
+ whenBrowserMainWindowReadyMock.mockReturnValue(rendererReady.promise)
+ const send = vi.fn()
+ const snapshot = vi.fn(async () => ({ browserPageId: 'page-target' }))
+ const bridge = {
+ getRegisteredTabs: vi.fn(() => new Map()),
+ snapshot
+ } as unknown as AgentBrowserBridge
+ const commands = new RuntimeBrowserCommands(
+ createHost({
+ getAgentBrowserBridge: () => bridge,
+ getAuthoritativeWindow: vi.fn(() => ({ webContents: { send } }) as never)
+ })
+ )
+
+ const result = commands.browserSnapshot({ worktree: 'id:wt-1', page: 'page-target' })
+ await vi.waitFor(() => expect(whenBrowserMainWindowReadyMock).toHaveBeenCalled())
+ expect(send).not.toHaveBeenCalled()
+
+ rendererReady.resolve(null)
+ await result
+
+ expect(send).toHaveBeenCalledWith('browser:activateView', {
+ worktreeId: 'wt-1',
+ browserPageId: 'page-target'
+ })
+ })
+
it('wakes the requested page before showing page-scoped tab metadata', async () => {
const { RuntimeBrowserCommands } = await import('./browser/browser-commands')
webContentsFromIdMock.mockReturnValue({ isDestroyed: () => true })