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): stop agent tabs in background worktrees reloading every ~10 s (#36245)

Kelvin Amoaba40552b059604
diff --git a/src/renderer/src/components/browser-pane/host-guest/browser-guest-eviction-veto.ts b/src/renderer/src/components/browser-pane/host-guest/browser-guest-eviction-veto.ts
index b136591210a..d0514c5cb05 100644
--- a/src/renderer/src/components/browser-pane/host-guest/browser-guest-eviction-veto.ts
+++ b/src/renderer/src/components/browser-pane/host-guest/browser-guest-eviction-veto.ts
@@ -3,11 +3,15 @@ import { browserTabVisibilityPageIds } from './browser-guest-worktree-retention'
import { hasActiveBrowserPageDownload } from '../navigate/browser-page-download-activity'
import { browserPageNeedsPaintRetention } from './browser-guest-paint-retention'
+// Agents, phones and paired viewers use pages without activating their worktree; this marks that use.
+export function browserTabsNeedPaintRetention(tabs: readonly BrowserWorkspace[]): boolean {
+ return tabs.some((tab) => browserTabVisibilityPageIds(tab).some(browserPageNeedsPaintRetention))
+}
+
// Eviction destroys rather than parks guests; unregistering cancels active downloads, so they veto eviction too.
export function browserTabsVetoGuestEviction(tabs: readonly BrowserWorkspace[]): boolean {
- return tabs.some((tab) =>
- browserTabVisibilityPageIds(tab).some(
- (pageId) => browserPageNeedsPaintRetention(pageId) || hasActiveBrowserPageDownload(pageId)
- )
+ return (
+ browserTabsNeedPaintRetention(tabs) ||
+ tabs.some((tab) => browserTabVisibilityPageIds(tab).some(hasActiveBrowserPageDownload))
)
}
diff --git a/src/renderer/src/components/browser-pane/host-guest/browser-guest-worktree-retention.test.ts b/src/renderer/src/components/browser-pane/host-guest/browser-guest-worktree-retention.test.ts
index 83c1b6e7dd5..3f90a81e3de 100644
--- a/src/renderer/src/components/browser-pane/host-guest/browser-guest-worktree-retention.test.ts
+++ b/src/renderer/src/components/browser-pane/host-guest/browser-guest-worktree-retention.test.ts
@@ -114,13 +114,13 @@ describe('selectBrowserGuestEvictionWorktreeIds', () => {
).toEqual(['wt-6'])
})
- it('lets a protected worktree within the budget occupy a retained slot', () => {
+ it('keeps a protected worktree without spending a retained slot on it', () => {
expect(
selectEvicted({
- orderedWorktreeIds: ['wt-1', 'wt-2', 'wt-3', 'wt-4', 'wt-5'],
+ orderedWorktreeIds: ['wt-1', 'wt-2', 'wt-3', 'wt-4', 'wt-5', 'wt-6'],
isEvictable: (worktreeId) => worktreeId !== 'wt-3'
})
- ).toEqual(['wt-5'])
+ ).toEqual(['wt-6'])
})
it('counts duplicated recency entries once', () => {
diff --git a/src/renderer/src/components/browser-pane/host-guest/browser-guest-worktree-retention.ts b/src/renderer/src/components/browser-pane/host-guest/browser-guest-worktree-retention.ts
index aa065580f80..7b0e140abb0 100644
--- a/src/renderer/src/components/browser-pane/host-guest/browser-guest-worktree-retention.ts
+++ b/src/renderer/src/components/browser-pane/host-guest/browser-guest-worktree-retention.ts
@@ -3,7 +3,7 @@ import type { BrowserPage, BrowserWorkspace } from '../../../../../shared/browse
// Limit idle retained guest processes across hidden worktrees; four covers common revisits while older pages rebuild from persisted state.
export const BROWSER_GUEST_HIDDEN_WORKTREE_RETENTION_LIMIT = 4
-/** Evict LRU-first beyond the hidden live-guest budget. Input is most-recent-first; active worktrees never count, and lazy vetoes may retain protected pages over budget. */
+/** Evict LRU-first beyond the hidden live-guest budget. Input is most-recent-first; active and vetoed worktrees keep their guests without using a slot. */
export function selectBrowserGuestEvictionWorktreeIds(args: {
orderedWorktreeIds: readonly string[]
activeWorktreeId: string | null
@@ -21,7 +21,8 @@ export function selectBrowserGuestEvictionWorktreeIds(args: {
seen.has(worktreeId) ||
worktreeId === args.activeWorktreeId ||
!args.isRetained(worktreeId) ||
- !args.holdsLiveGuests(worktreeId)
+ !args.holdsLiveGuests(worktreeId) ||
+ !args.isEvictable(worktreeId)
) {
seen.add(worktreeId)
continue
@@ -31,9 +32,7 @@ export function selectBrowserGuestEvictionWorktreeIds(args: {
retained += 1
continue
}
- if (args.isEvictable(worktreeId)) {
- evictedIds.push(worktreeId)
- }
+ evictedIds.push(worktreeId)
}
return evictedIds
}
diff --git a/src/renderer/src/components/use-terminal-browser-retention.test.tsx b/src/renderer/src/components/use-terminal-browser-retention.test.tsx
new file mode 100644
index 00000000000..45461727bc5
--- /dev/null
+++ b/src/renderer/src/components/use-terminal-browser-retention.test.tsx
@@ -0,0 +1,83 @@
+// @vitest-environment happy-dom
+import { act, cleanup, renderHook } from '@testing-library/react'
+import { useRef, useState } from 'react'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+
+const ACTIVE = 'wt-active'
+const AGENT = 'wt-agent'
+const RECENT_HIDDEN = ['wt-d', 'wt-c', 'wt-b', 'wt-a']
+const SURFACES = [ACTIVE, ...RECENT_HIDDEN, AGENT]
+const SURFACE_ID_SET = new Set(SURFACES)
+
+const mocks = vi.hoisted(() => ({ destroyWorktreeBrowserGuests: vi.fn() }))
+
+vi.mock('../store', () => ({
+ useAppStore: {
+ getState: () => ({
+ browserTabsByWorktree: Object.fromEntries(
+ SURFACES.map((worktreeId) => [
+ worktreeId,
+ [{ id: `tab-${worktreeId}`, pageIds: [`page-${worktreeId}`] }]
+ ])
+ ),
+ browserPagesByWorkspace: {}
+ })
+ }
+}))
+vi.mock('../store/slices/browser-webview-cleanup', () => ({
+ destroyWorktreeBrowserGuests: (_tabs: unknown, _pages: unknown, worktreeId: string) =>
+ mocks.destroyWorktreeBrowserGuests(worktreeId)
+}))
+vi.mock('./browser-pane/host-guest/webview-registry', () => ({
+ hasLiveBrowserGuest: () => true
+}))
+vi.mock('./browser-pane/navigate/browser-page-download-activity', () => ({
+ installBrowserPageDownloadActivityTracking: () => () => {},
+ hasActiveBrowserPageDownload: () => false
+}))
+
+const { acquireBrowserAutomationVisibility, releaseBrowserAutomationVisibility } =
+ await import('./browser-pane/host-guest/browser-automation-visibility')
+const { useTerminalBrowserRetention } = await import('./use-terminal-browser-retention')
+
+function renderRetention(): void {
+ renderHook(() => {
+ const [revision, setRevision] = useState(0)
+ const recencyRef = useRef([...RECENT_HIDDEN])
+ const mountedRef = useRef(new Set(SURFACES))
+ useTerminalBrowserRetention({
+ browserGuestRetentionBudgetEnabled: true,
+ browserGuestRetentionRevision: revision,
+ browserGuestWorktreeRecencyRef: recencyRef,
+ mountedWorktreeIdsRef: mountedRef,
+ renderedActiveWorktreeId: ACTIVE,
+ setBrowserGuestRetentionRevision: setRevision,
+ workspaceSurfaceIds: SURFACES,
+ workspaceSurfaceIdSet: SURFACE_ID_SET
+ })
+ })
+}
+
+afterEach(() => {
+ cleanup()
+ mocks.destroyWorktreeBrowserGuests.mockReset()
+})
+
+describe('useTerminalBrowserRetention', () => {
+ it('keeps a hidden worktree an agent just drove when its automation lease lapses', () => {
+ renderRetention()
+ mocks.destroyWorktreeBrowserGuests.mockReset()
+
+ let token = ''
+ act(() => {
+ token = acquireBrowserAutomationVisibility(`page-${AGENT}`)
+ })
+ act(() => {
+ releaseBrowserAutomationVisibility(token)
+ })
+
+ const evicted = mocks.destroyWorktreeBrowserGuests.mock.calls.map(([worktreeId]) => worktreeId)
+ expect(evicted).not.toContain(AGENT)
+ expect(evicted).toContain('wt-a')
+ })
+})
diff --git a/src/renderer/src/components/use-terminal-browser-retention.ts b/src/renderer/src/components/use-terminal-browser-retention.ts
index c93efe1df72..e7a74bd4482 100644
--- a/src/renderer/src/components/use-terminal-browser-retention.ts
+++ b/src/renderer/src/components/use-terminal-browser-retention.ts
@@ -1,7 +1,10 @@
import { useEffect } from 'react'
import { useAppStore } from '../store'
import { onBrowserGuestPaintRetentionChange } from './browser-pane/host-guest/browser-guest-paint-retention'
-import { browserTabsVetoGuestEviction } from './browser-pane/host-guest/browser-guest-eviction-veto'
+import {
+ browserTabsNeedPaintRetention,
+ browserTabsVetoGuestEviction
+} from './browser-pane/host-guest/browser-guest-eviction-veto'
import {
selectBrowserGuestEvictionWorktreeIds,
touchBrowserGuestWorktreeRecency,
@@ -12,7 +15,19 @@ import { hasLiveBrowserGuest } from './browser-pane/host-guest/webview-registry'
import { destroyWorktreeBrowserGuests } from '../store/slices/browser-webview-cleanup'
import type { TerminalParkingFoundation } from './use-terminal-parking-foundation'
-export function useTerminalBrowserRetention(controller: TerminalParkingFoundation): void {
+export function useTerminalBrowserRetention(
+ controller: Pick<
+ TerminalParkingFoundation,
+ | 'browserGuestRetentionBudgetEnabled'
+ | 'browserGuestRetentionRevision'
+ | 'browserGuestWorktreeRecencyRef'
+ | 'mountedWorktreeIdsRef'
+ | 'renderedActiveWorktreeId'
+ | 'setBrowserGuestRetentionRevision'
+ | 'workspaceSurfaceIds'
+ | 'workspaceSurfaceIdSet'
+ >
+): void {
const {
browserGuestRetentionBudgetEnabled,
browserGuestRetentionRevision,
@@ -37,10 +52,17 @@ export function useTerminalBrowserRetention(controller: TerminalParkingFoundatio
}, [setBrowserGuestRetentionRevision])
useEffect(() => {
+ const recency = browserGuestWorktreeRecencyRef.current
+ const state = useAppStore.getState()
+ // A hidden worktree an agent or phone just used counts as recent; otherwise it sorts last and is evicted as soon as its claim lapses.
+ for (const worktreeId of workspaceSurfaceIds) {
+ if (browserTabsNeedPaintRetention(state.browserTabsByWorktree[worktreeId] ?? [])) {
+ touchBrowserGuestWorktreeRecency(recency, worktreeId)
+ }
+ }
if (!renderedActiveWorktreeId) {
return
}
- const recency = browserGuestWorktreeRecencyRef.current
touchBrowserGuestWorktreeRecency(recency, renderedActiveWorktreeId)
for (let index = recency.length - 1; index >= 0; index--) {
if (!workspaceSurfaceIdSet.has(recency[index])) {
@@ -50,7 +72,6 @@ export function useTerminalBrowserRetention(controller: TerminalParkingFoundatio
if (!browserGuestRetentionBudgetEnabled) {
return
}
- const state = useAppStore.getState()
const recencyIds = new Set(recency)
const orderedWorktreeIds = [
...recency,