From 075435fe2804fe09ea1f213fa36d0233d4af05ae Mon Sep 17 00:00:00 2001 From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com> Date: Wed, 11 Nov 2026 06:41:32 -0800 Subject: [PATCH] Preserve browser page ownership across profile replacement --- .../BrowserPane.webview-preferences.test.ts | 6 +- .../assemble-chrome/BrowserToolbarMenu.tsx | 5 - .../assemble-chrome/browser-page-pane.tsx | 2 + .../assemble-chrome/browser-page-toolbar.tsx | 2 - ...er-workspace-pane.retention-props.test.tsx | 2 +- .../browser-workspace-pane.tsx | 16 +- .../ssh-routed-browser-page-gate.tsx | 18 +- .../describe-page/browser-page-types.ts | 1 + .../host-guest/attach-browser-page-webview.ts | 9 + .../browser-page-mount-admission.ts | 11 + .../host-guest/browser-page-partition.ts | 40 + ...rowser-page-registration-ownership.test.ts | 80 +- .../browser-page-webview-loading-handlers.ts | 5 +- .../browser-profile-guest-lifetime.test.tsx | 814 ++++++++++++++++++ .../browser-profile-native.test-fixture.ts | 234 +++++ .../host-guest/browser-webview-disposal.ts | 69 ++ .../use-browser-page-webview-lifecycle.ts | 9 +- .../use-browser-page-webview-partition.ts | 32 +- .../host-guest/webview-registry.ts | 53 +- .../ssh-workspace-browser-verified-routes.ts | 15 + .../use-ssh-workspace-browser-route.ts | 26 +- .../browser-request-ipc-bridge.owner.test.ts | 2 +- .../browser-request-ipc-bridge.split.test.ts | 2 +- .../ipc-events/browser-request-ipc-bridge.ts | 13 - .../browser-mount-admission-removal.test.ts | 2 +- .../cleanup/browser-webview-cleanup.ts | 4 +- .../browser-profile-guest-reconciliation.ts | 61 ++ .../browser-profile-switch-actions.ts | 7 +- 28 files changed, 1398 insertions(+), 142 deletions(-) create mode 100644 src/renderer/src/components/browser-pane/host-guest/browser-page-partition.ts create mode 100644 src/renderer/src/components/browser-pane/host-guest/browser-profile-guest-lifetime.test.tsx create mode 100644 src/renderer/src/components/browser-pane/host-guest/browser-profile-native.test-fixture.ts create mode 100644 src/renderer/src/components/browser-pane/host-guest/browser-webview-disposal.ts create mode 100644 src/renderer/src/components/browser-pane/ssh-workspace-browser-verified-routes.ts create mode 100644 src/renderer/src/store/slices/browser/profiles/browser-profile-guest-reconciliation.ts diff --git a/src/renderer/src/components/browser-pane/assemble-chrome/BrowserPane.webview-preferences.test.ts b/src/renderer/src/components/browser-pane/assemble-chrome/BrowserPane.webview-preferences.test.ts index 926f700f50a..7ab72a14f5f 100644 --- a/src/renderer/src/components/browser-pane/assemble-chrome/BrowserPane.webview-preferences.test.ts +++ b/src/renderer/src/components/browser-pane/assemble-chrome/BrowserPane.webview-preferences.test.ts @@ -2,14 +2,14 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' const registryMocks = vi.hoisted(() => ({ - destroyPersistentWebview: vi.fn(), + closePersistentBrowserPage: vi.fn(), registerPersistentWebview: vi.fn(), replacePersistentWebview: vi.fn(), webviewRegistry: new Map() })) vi.mock('../host-guest/webview-registry', () => ({ - destroyPersistentWebview: registryMocks.destroyPersistentWebview, + closePersistentBrowserPage: registryMocks.closePersistentBrowserPage, registerPersistentWebview: registryMocks.registerPersistentWebview, replacePersistentWebview: registryMocks.replacePersistentWebview, webviewRegistry: registryMocks.webviewRegistry @@ -26,7 +26,7 @@ function createContainer(id: string): HTMLDivElement { describe('BrowserPane webview preferences', () => { beforeEach(() => { - registryMocks.destroyPersistentWebview.mockReset() + registryMocks.closePersistentBrowserPage.mockReset() registryMocks.registerPersistentWebview.mockReset() registryMocks.replacePersistentWebview.mockReset() registryMocks.webviewRegistry.clear() diff --git a/src/renderer/src/components/browser-pane/assemble-chrome/BrowserToolbarMenu.tsx b/src/renderer/src/components/browser-pane/assemble-chrome/BrowserToolbarMenu.tsx index fd2364c14e0..87ba6910bc8 100644 --- a/src/renderer/src/components/browser-pane/assemble-chrome/BrowserToolbarMenu.tsx +++ b/src/renderer/src/components/browser-pane/assemble-chrome/BrowserToolbarMenu.tsx @@ -29,7 +29,6 @@ type BrowserToolbarMenuProps = { workspaceId: string browserPageId: string viewportPresetId: BrowserViewportPresetId | null - onDestroyWebview: () => void isActive: boolean /** A blank tab shows the import hint on its new tab page, so the tour points there instead. */ isBlankTab: boolean @@ -44,7 +43,6 @@ export function BrowserToolbarMenu({ workspaceId, browserPageId, viewportPresetId, - onDestroyWebview, isActive, isBlankTab, pageActions, @@ -150,8 +148,6 @@ export function BrowserToolbarMenu({ } const targetId = pendingSwitchProfileId ?? 'default' const profile = browserSessionProfiles.find((p) => p.id === targetId) - // Destroy before updating the store; otherwise the stable registry key would reclaim the old partition. - onDestroyWebview() // Persist the partition with the profile so stale renderer mirrors cannot weaken tab isolation. switchBrowserTabProfile(workspaceId, pendingSwitchProfileId, profile?.partition ?? null) toast.success( @@ -192,7 +188,6 @@ export function BrowserToolbarMenu({ setNewProfileDialogOpen(false) setNewProfileName('') - onDestroyWebview() switchBrowserTabProfile(workspaceId, profile.id, profile.partition) toast.success( t( diff --git a/src/renderer/src/components/browser-pane/assemble-chrome/browser-page-pane.tsx b/src/renderer/src/components/browser-pane/assemble-chrome/browser-page-pane.tsx index ca2157b01bf..ab1120caf75 100644 --- a/src/renderer/src/components/browser-pane/assemble-chrome/browser-page-pane.tsx +++ b/src/renderer/src/components/browser-pane/assemble-chrome/browser-page-pane.tsx @@ -54,6 +54,7 @@ export function BrowserPagePane({ isAutomationVisible, isMobileDriven, isRemotelyViewed, + isMountAdmitted = false, inputLocked, onUpdatePageState, onSetUrl @@ -202,6 +203,7 @@ export function BrowserPagePane({ webviewPartition, isActive, isPaintable, + isMountAdmitted, slotViewport, viewportPresetId: browserTab.viewportPresetId ?? null, addressBarInputRef, diff --git a/src/renderer/src/components/browser-pane/assemble-chrome/browser-page-toolbar.tsx b/src/renderer/src/components/browser-pane/assemble-chrome/browser-page-toolbar.tsx index 46bfecf7f90..01e258f2810 100644 --- a/src/renderer/src/components/browser-pane/assemble-chrome/browser-page-toolbar.tsx +++ b/src/renderer/src/components/browser-pane/assemble-chrome/browser-page-toolbar.tsx @@ -12,7 +12,6 @@ import { BrowserExtensionToolbar, BrowserExtensionsMenuSub } from './browser-ext import { BrowserOpenSourceFileButton, BrowserPageStateChips } from './browser-address-chips' import { useBrowserExtensionToolbar } from './use-browser-extension-toolbar' import { SshEgressIndicator } from './browser-egress-indicator' -import { destroyPersistentWebview } from '../host-guest/webview-registry' import { getShareableBrowserArtifactFile, readBrowserHtmlArtifactRequest @@ -252,7 +251,6 @@ export function BrowserPageToolbar({ workspaceId={workspaceId} browserPageId={browserPageId} viewportPresetId={viewportPresetId} - onDestroyWebview={() => destroyPersistentWebview(browserPageId)} isActive={isActive} isBlankTab={isBlankTab} pageActions={{ diff --git a/src/renderer/src/components/browser-pane/assemble-chrome/browser-workspace-pane.retention-props.test.tsx b/src/renderer/src/components/browser-pane/assemble-chrome/browser-workspace-pane.retention-props.test.tsx index f3e8196de32..42187be5dc4 100644 --- a/src/renderer/src/components/browser-pane/assemble-chrome/browser-workspace-pane.retention-props.test.tsx +++ b/src/renderer/src/components/browser-pane/assemble-chrome/browser-workspace-pane.retention-props.test.tsx @@ -38,7 +38,7 @@ vi.mock('@/components/contextual-tours/use-contextual-tour', () => ({ })) vi.mock('../host-guest/webview-registry', () => ({ - destroyPersistentWebview: () => {} + replacePersistentWebview: () => {} })) vi.mock('./ssh-routed-browser-page-gate', () => ({ diff --git a/src/renderer/src/components/browser-pane/assemble-chrome/browser-workspace-pane.tsx b/src/renderer/src/components/browser-pane/assemble-chrome/browser-workspace-pane.tsx index ac2a1165b31..69520fbe92d 100644 --- a/src/renderer/src/components/browser-pane/assemble-chrome/browser-workspace-pane.tsx +++ b/src/renderer/src/components/browser-pane/assemble-chrome/browser-workspace-pane.tsx @@ -3,7 +3,7 @@ import { useAppStore } from '@/store' import { runtimeEnvironmentIdOrLocalUnlessTwin } from '@/lib/workspace/ownership/worktree-runtime-owner' import { isClientHostedBrowserPageHandle } from '@/store/slices/browser/hosts/browser-host-state' import type { BrowserWorkspace as BrowserWorkspaceState } from '../../../../../shared/browser-workspace-types' -import { destroyPersistentWebview } from '../host-guest/webview-registry' +import { replacePersistentWebview } from '../host-guest/webview-registry' import { useBrowserAutomationVisiblePageIds } from '../host-guest/browser-automation-visibility' import { getBrowserPagesForWorkspace } from './browser-pane-page-selection' import { BrowserMobileDriverOverlay } from './BrowserMobileDriverOverlay' @@ -27,10 +27,7 @@ import { ManagedBrowserProfileHold, useManagedBrowserProfileStatus } from './managed-browser-profile-hold' -import { - isBrowserPageMountAdmitted, - useAnyBrowserPageMountAdmission -} from '../host-guest/browser-page-mount-admission' +import { useBrowserPageMountAdmissions } from '../host-guest/browser-page-mount-admission' export default function BrowserPane({ browserTab, @@ -80,7 +77,7 @@ export default function BrowserPane({ () => localBrowserPages.map((page) => page.id), [localBrowserPages] ) - const hasAdmittedPage = useAnyBrowserPageMountAdmission(localBrowserPageIds) + const mountAdmissions = useBrowserPageMountAdmissions(localBrowserPageIds) const managedProfileStatus = useManagedBrowserProfileStatus(browserTab.sessionProfileId) const pageDriver = useBrowserDriverForPage(activeBrowserPageId) // Why: a runtime-backed page is streamed, never locally driven, so its driver must read idle. @@ -92,7 +89,7 @@ export default function BrowserPane({ } for (const page of browserPages) { if (getBrowserPageRuntimeEnvironmentId(page, activeRuntimeEnvironmentId)) { - destroyPersistentWebview(page.id) + void replacePersistentWebview(page.id) } } }, [activeRuntimeEnvironmentId, browserPages, runtimeEnvironmentActive]) @@ -171,14 +168,14 @@ export default function BrowserPane({ > {(routedPartition) => (
- {localBrowserPages.map((page) => ( + {localBrowserPages.map((page, index) => ( void onSetUrl: BrowserPageUrlSetter diff --git a/src/renderer/src/components/browser-pane/host-guest/attach-browser-page-webview.ts b/src/renderer/src/components/browser-pane/host-guest/attach-browser-page-webview.ts index a5907d2a88c..edcf2a334f2 100644 --- a/src/renderer/src/components/browser-pane/host-guest/attach-browser-page-webview.ts +++ b/src/renderer/src/components/browser-pane/host-guest/attach-browser-page-webview.ts @@ -8,6 +8,8 @@ import type { BrowserViewportPresetId } from '../../../../../shared/browser-workspace-types' import { ensureBrowserPageWebview } from './browser-page-webview' +import { webviewRegistry } from './webview-registry' +import { isBrowserPageMountAdmitted } from './browser-page-mount-admission' import { applyBrowserPageViewportLayout, ensureBrowserPageViewport } from './browser-page-viewport' import { seedLiveBrowserUrl } from '../describe-page/live-browser-url-registry' import type { BrowserOverlayViewport } from '../describe-page/browser-annotation-geometry' @@ -65,6 +67,13 @@ export type AttachBrowserPageWebviewArgs = { export function attachBrowserPageWebview( args: AttachBrowserPageWebviewArgs ): (() => void) | undefined { + if ( + !webviewRegistry.has(args.browserTabId) && + !args.isPaintableRef.current && + !isBrowserPageMountAdmitted(args.browserTabId) + ) { + return + } const { browserTabId, workspaceId, diff --git a/src/renderer/src/components/browser-pane/host-guest/browser-page-mount-admission.ts b/src/renderer/src/components/browser-pane/host-guest/browser-page-mount-admission.ts index 7547c61e71e..a12e84e2797 100644 --- a/src/renderer/src/components/browser-pane/host-guest/browser-page-mount-admission.ts +++ b/src/renderer/src/components/browser-pane/host-guest/browser-page-mount-admission.ts @@ -29,6 +29,17 @@ export function releaseBrowserPageMount(pageId: string): void { emit() } +export function useBrowserPageMountAdmissions(pageIds: readonly string[]): string { + return useSyncExternalStore( + (listener) => { + listeners.add(listener) + return () => listeners.delete(listener) + }, + () => pageIds.map((pageId) => (isBrowserPageMountAdmitted(pageId) ? '1' : '0')).join(''), + () => '0'.repeat(pageIds.length) + ) +} + export function useAnyBrowserPageMountAdmission(pageIds: readonly string[]): boolean { return useSyncExternalStore( (listener) => { diff --git a/src/renderer/src/components/browser-pane/host-guest/browser-page-partition.ts b/src/renderer/src/components/browser-pane/host-guest/browser-page-partition.ts new file mode 100644 index 00000000000..04b4c6dc888 --- /dev/null +++ b/src/renderer/src/components/browser-pane/host-guest/browser-page-partition.ts @@ -0,0 +1,40 @@ +import type { BrowserSessionProfile } from '../../../../../shared/browser-workspace-types' +import { ORCA_BROWSER_PARTITION } from '../../../../../shared/browser/browser-session-partition' +import { getOrcaProfileBrowserDefaultPartition } from '../../../../../shared/orca-profiles' +import { unadmittedBrowserPartition } from '../../../../../shared/browser/profiles/browser-profile-scope' + +export function resolveBrowserPagePartition({ + sessionProfileId, + sessionPartition, + localProfiles, + mirroredProfiles, + activeOrcaProfileId +}: { + sessionProfileId: string | null + sessionPartition: string | null + localProfiles: readonly BrowserSessionProfile[] | undefined + mirroredProfiles: readonly BrowserSessionProfile[] + activeOrcaProfileId: string | null +}): string { + const browserSessionProfiles = localProfiles ?? mirroredProfiles + const fallbackBrowserPartition = activeOrcaProfileId + ? getOrcaProfileBrowserDefaultPartition(activeOrcaProfileId) + : null + const defaultSessionProfile = browserSessionProfiles.find((p) => p.id === 'default') ?? null + const sessionProfile = sessionProfileId + ? (browserSessionProfiles.find((p) => p.id === sessionProfileId) ?? null) + : defaultSessionProfile + if (sessionPartition) { + return sessionPartition + } + // A deleted profile must not fall back to Default's cookie jar. + if (sessionProfileId && !sessionProfile && localProfiles) { + return unadmittedBrowserPartition(sessionProfileId) + } + return ( + sessionProfile?.partition ?? + defaultSessionProfile?.partition ?? + fallbackBrowserPartition ?? + ORCA_BROWSER_PARTITION + ) +} diff --git a/src/renderer/src/components/browser-pane/host-guest/browser-page-registration-ownership.test.ts b/src/renderer/src/components/browser-pane/host-guest/browser-page-registration-ownership.test.ts index 7722643eac4..85384fad2fa 100644 --- a/src/renderer/src/components/browser-pane/host-guest/browser-page-registration-ownership.test.ts +++ b/src/renderer/src/components/browser-pane/host-guest/browser-page-registration-ownership.test.ts @@ -6,11 +6,18 @@ import { type BrowserPageWebviewGuestSession } from './browser-page-webview-guest-session' import { - destroyPersistentWebview, + closePersistentBrowserPage, + replacePersistentWebview, registerPersistentWebview, registeredWebContentsIds, webviewRegistry } from './webview-registry' +import { createBrowserPageWebviewLoadingHandlers } from './browser-page-webview-loading-handlers' +import { + admitBrowserPageMount, + isBrowserPageMountAdmitted, + releaseBrowserPageMount +} from './browser-page-mount-admission' vi.mock('../describe-page/browser-page-load-error', () => ({ browserPageExists: () => true })) @@ -61,6 +68,10 @@ function createSession( let liveGuestId = guestId webview.getWebContentsId = () => liveGuestId webview.getZoomLevel = () => 0 + webview.getURL = () => 'https://example.test' + webview.getTitle = () => 'Example' + webview.canGoBack = () => false + webview.canGoForward = () => false webview.setZoomLevel = vi.fn() if (!previous) { document.body.appendChild(webview) @@ -145,7 +156,7 @@ afterEach(async () => { for (const page of sessions.splice(0)) { page.session.guestRecovery.dispose() page.webviewRef.current = null - await destroyPersistentWebview(page.id) + await closePersistentBrowserPage(page.id) page.webview.remove() } registeredWebContentsIds.clear() @@ -156,7 +167,7 @@ describe('renderer registration completion ownership', () => { const old = createSession('page', 1) old.session.handleDidAttach() old.session.guestRecovery.dispose() - await destroyPersistentWebview('page') + await closePersistentBrowserPage('page') const replacement = createSession('page', 2) replacement.session.handleDidAttach() replies[1].resolve(true) @@ -218,7 +229,7 @@ describe('renderer registration completion ownership', () => { it('does not restore a registry-removed guest before listener disposal runs', async () => { const page = createSession('page', 1) page.session.handleDidAttach() - await destroyPersistentWebview('page') + await closePersistentBrowserPage('page') replies[0].resolve(true) await flush() expect(registeredWebContentsIds.has('page')).toBe(false) @@ -267,7 +278,7 @@ describe('renderer registration completion ownership', () => { registeredWebContentsIds.set('page', 1) page.session.guestRecovery.validateAfterResume() page.session.guestRecovery.dispose() - await destroyPersistentWebview('page') + await closePersistentBrowserPage('page') reply.resolve(false) await flush() expect(repair).not.toHaveBeenCalled() @@ -296,3 +307,62 @@ describe('renderer registration completion ownership', () => { expect(page.update).not.toHaveBeenCalled() }) }) + +it('keeps a reentrant replacement and its native ID when removing the previous guest', async () => { + const old = createSession('reentrant', 1) + registeredWebContentsIds.set(old.id, 1) + const remove = old.webview.remove.bind(old.webview) + old.webview.remove = () => { + remove() + createSession('reentrant', 2) + registeredWebContentsIds.set(old.id, 2) + } + await replacePersistentWebview(old.id) + old.webview.remove = remove + expect(webviewRegistry.get(old.id)).toBe(sessions.at(-1)!.webview) + expect(registeredWebContentsIds.get(old.id)).toBe(2) + expect(unregister).toHaveBeenCalledExactlyOnceWith({ + browserPageId: old.id, + webContentsId: 1, + replacement: true + }) +}) + +it('never sends page-only native replacement when the element has no known native identity', async () => { + const old = createSession('not-attached', 1) + old.webview.getWebContentsId = () => { + throw new Error('Not attached') + } + await replacePersistentWebview(old.id) + expect(unregister).not.toHaveBeenCalled() + expect(webviewRegistry.has(old.id)).toBe(false) +}) + +it('lets only the current guest settle a replacement admission', () => { + const old = createSession('settlement', 1) + const current = createSession('settlement', 2) + admitBrowserPageMount(old.id) + const ref = (value: T) => ({ current: value }) + const loading = (webview: Electron.WebviewTag) => + createBrowserPageWebviewLoadingHandlers({ + webview, + browserTabId: old.id, + faviconUrlRef: ref(null), + browserTabUrlRef: ref('https://example.test'), + addressBarValueRef: ref('https://example.test'), + addressBarInputRef: ref(null), + activeLoadFailureRef: ref(null), + lastKnownWebviewUrlRef: ref(null), + keepAddressBarFocusRef: ref(false), + recoveryNavigationValidationRef: ref(null), + onUpdatePageStateRef: ref(vi.fn()), + onSetUrlRef: ref(vi.fn()), + setAddressBarValue: vi.fn(), + focusAddressBarNow: () => false + }) + loading(old.webview).handleDidStopLoading() + expect(isBrowserPageMountAdmitted(old.id)).toBe(true) + loading(current.webview).handleDidStopLoading() + expect(isBrowserPageMountAdmitted(old.id)).toBe(false) + releaseBrowserPageMount(old.id) +}) diff --git a/src/renderer/src/components/browser-pane/host-guest/browser-page-webview-loading-handlers.ts b/src/renderer/src/components/browser-pane/host-guest/browser-page-webview-loading-handlers.ts index 2fc659aad36..e3168aee34f 100644 --- a/src/renderer/src/components/browser-pane/host-guest/browser-page-webview-loading-handlers.ts +++ b/src/renderer/src/components/browser-pane/host-guest/browser-page-webview-loading-handlers.ts @@ -10,6 +10,7 @@ import { isBrowserLoadBlockedByExtension } from '../../../../../shared/browser-l import { translate } from '@/i18n/i18n' import { BROWSER_GUEST_RECOVERY_ERROR_CODE } from './browser-page-guest-recovery' import { releaseBrowserPageMount } from './browser-page-mount-admission' +import { webviewRegistry } from './webview-registry' import { rememberLiveBrowserUrl } from '../describe-page/live-browser-url-registry' import { resolveBrowserWebviewLoadFailure } from '../navigate/browser-webview-load-failure' import { resolveActiveBrowserLoadFailure } from '../navigate/browser-load-failure-for-url' @@ -65,7 +66,9 @@ export function createBrowserPageWebviewLoadingHandlers({ }: BrowserPageWebviewLoadingHandlersArgs): BrowserPageWebviewLoadingHandlers { const handleDidStopLoading = (): void => { // Admission starts background guests only; after any first load settlement, normal paint-retention rules decide layout. - releaseBrowserPageMount(browserTabId) + if (webviewRegistry.get(browserTabId) === webview) { + releaseBrowserPageMount(browserTabId) + } const currentUrl = webview.getURL() || webview.src || 'about:blank' const browserModelUrl = redactKagiSessionToken(currentUrl) const activeLoadFailure = activeLoadFailureRef.current diff --git a/src/renderer/src/components/browser-pane/host-guest/browser-profile-guest-lifetime.test.tsx b/src/renderer/src/components/browser-pane/host-guest/browser-profile-guest-lifetime.test.tsx new file mode 100644 index 00000000000..2299d51c4b9 --- /dev/null +++ b/src/renderer/src/components/browser-pane/host-guest/browser-profile-guest-lifetime.test.tsx @@ -0,0 +1,814 @@ +// @vitest-environment happy-dom +import { act, cleanup, render } from '@testing-library/react' +import { useRef } from 'react' +import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../shared/layout-owner-switch' +import { createGlobalSettingsFixture } from '../../../../../shared/global-settings-test-fixture' +import { afterEach, beforeEach, expect, it, vi } from 'vitest' +import type { BrowserPagePaneProps } from '../describe-page/browser-page-types' +import type { createTestStore as CreateTestStore } from '@/store/testing/app-store-test-fixture' +import type { AppState } from '@/store/types' + +type ProfileMocks = { + native: Map + store: ReturnType | null + agent: boolean + renders: Map + prepareRoute: ReturnType + profileRequest: + | ((args: { + requestId: string + browserPageId: string + profileId: string + sessionPartition: string + }) => void) + | null +} +const mocks = vi.hoisted(() => ({ + native: new Map(), + store: null, + agent: false, + renders: new Map(), + prepareRoute: vi.fn(), + profileRequest: null +})) +vi.mock('electron', () => ({ + app: { getPath: () => '/downloads' }, + BrowserWindow: { fromWebContents: () => null }, + clipboard: { writeText: vi.fn() }, + shell: { openExternal: vi.fn() }, + Menu: { buildFromTemplate: vi.fn() }, + screen: { getCursorScreenPoint: () => ({ x: 0, y: 0 }) }, + webContents: { fromId: (id: number) => mocks.native.get(id) ?? null } +})) +vi.mock( + '../../../../../main/browser/guest-lifecycle/popups/presentation/popup-origin-bar-window', + () => ({ openPopupWithOriginBar: vi.fn() }) +) +vi.mock('../../../../../main/runtime/rpc/rpc-active-caller', () => ({ + getActiveRpcCaller: () => ({ kind: mocks.agent ? 'local-cli' : 'desktop' }) +})) +vi.mock('../../../../../main/window/renderer-publication-throttle', () => ({ + rendererPublicationThrottle: { acquire: () => vi.fn() } +})) +vi.mock( + '../../../../../main/browser/guest-lifecycle/manager/registration/browser-guest-discard-protection', + async (original) => ({ + ...(await original()), + readBrowserGuestDiscardProtection: () => ({ protection: 'discardable' }) + }) +) +vi.mock('@/store', () => ({ + useAppStore: Object.assign((selector: (state: AppState) => unknown) => mocks.store!(selector), { + getState: () => mocks.store!.getState() + }) +})) +vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (original) => + ( + await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture') + ).runtimeRpcClientWithLayoutApply(await original()) +) +vi.mock('@/runtime/workspace-layout/frames/runtime-layout-client', async (original) => + ( + await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture') + ).runtimeLayoutClientWithTestFrames(await original()) +) +vi.mock('@/components/contextual-tours/use-contextual-tour', () => ({ + useContextualTour: () => {} +})) +vi.mock('@/lib/workspace/ownership/worktree-host-connection-phase', () => ({ + useWorktreeHostConnection: () => ({ + phase: 'connected', + targetId: 'target-a', + connectedEpoch: 'target-a:1' + }) +})) +vi.mock('../annotate/guest-annotation-viewport-bridge', () => ({ + syncGuestAnnotationViewportBridge: () => {} +})) +vi.mock('@/components/native-chat/media/visuals/NativeChatVisualGuestThemePublisher', () => ({ + publishNativeChatVisualGuestTheme: () => {} +})) +vi.mock('../assemble-chrome/browser-page-pane', () => ({ + BrowserPagePane: (props: BrowserPagePaneProps) => +})) +vi.mock('../stream-remote/remote-browser-page-pane', () => ({ + RemoteBrowserPagePane: () => Remote page +})) +vi.mock('../ClientHostedBrowserPagePane', () => ({ + ClientHostedBrowserPagePane: () => Client page +})) + +import { createTestStore, seedStore } from '@/store/testing/app-store-test-fixture' +import { makeWorktree } from '@/store/slices/worktrees/worktree.test-fixture' +import { + drawTabsFromMain, + type TabsDrawnFromMain +} from '@/store/slices/tabs/tabs-drawn-from-main.test-fixture' +import { registerBrowserRequestIpcBridge } from '@/hooks/ipc-events/browser-request-ipc-bridge' +import BrowserPane from '../assemble-chrome/browser-workspace-pane' +import { useBrowserPageWebviewLifecycle } from './use-browser-page-webview-lifecycle' +import { useBrowserPageWebviewPartition } from './use-browser-page-webview-partition' +import { + ensureBrowserPageViewport, + registerBrowserOverlaySlotViewport +} from './browser-page-viewport' +import { installBrowserGuestPageRetention } from './browser-guest-page-retention' +import { verifiedPartitionByRoute } from '../ssh-workspace-browser-verified-routes' +import { + installProfileNativeFixture, + ProfileTestGuest +} from './browser-profile-native.test-fixture' +import { discardPersistentWebview, webviewRegistry } from './webview-registry' +import { + admitBrowserPageMount, + isBrowserPageMountAdmitted, + releaseBrowserPageMount +} from './browser-page-mount-admission' +import { + browserMemoryGeneration, + claimBrowserMemoryPage, + reserveBrowserPageDiscard, + retainBrowserMemoryPageForAgent, + waitForBrowserPageReady +} from '../../../../../main/browser/guest-lifecycle/browser-page-memory' +import { + collectBrowserWebviewIds, + destroyRemovedBrowserWebview, + destroyWebviewsRemovedFromStore +} from '@/store/slices/browser/cleanup/browser-webview-cleanup' + +const WT = 'repo1::/path/wt1' +const ref = (current: T) => ({ current }) +const noFocus = () => false +function LifecyclePage(props: BrowserPagePaneProps) { + const { browserTab: page } = props + mocks.renders.set(page.id, (mocks.renders.get(page.id) ?? 0) + 1) + const refs = useRef({ + addressBarInputRef: ref(null), + addressBarValueRef: ref(page.url), + browserTabUrlRef: ref(page.url), + keepAddressBarFocusRef: ref(false), + handleInternalFileDragOverRef: ref(() => {}), + handleInternalFileDropRef: ref(() => {}), + dismissAddressBarSuggestionsRef: ref(null), + lastKnownWebviewUrlRef: ref(null), + recoveryNavigationValidationRef: ref(null), + activeLoadFailureRef: ref(null), + retryGuestRecoveryRef: ref(() => {}), + webviewRef: ref(null), + onUpdatePageStateRef: ref(props.onUpdatePageState), + onSetUrlRef: ref(props.onSetUrl) + }).current + const partition = useBrowserPageWebviewPartition(props) + const viewport = ensureBrowserPageViewport(page.id, props.workspaceId) + useBrowserPageWebviewLifecycle({ + ...refs, + browserTabId: page.id, + browserTabUrl: page.url, + browserTabLoading: page.loading, + browserTabLoadError: page.loadError, + workspaceId: props.workspaceId, + worktreeId: props.worktreeId, + sessionProfileId: props.sessionProfileId, + webviewPartition: partition, + isActive: props.isActive, + isPaintable: + props.isActive || props.isAutomationVisible || props.isMobileDriven || props.isRemotelyViewed, + isMountAdmitted: props.isMountAdmitted ?? false, + slotViewport: viewport?.container ?? null, + viewportPresetId: null, + onUpdatePageState: props.onUpdatePageState, + onSetUrl: props.onSetUrl, + setAddressBarValue: () => {}, + cancelPendingBrowserCapture: () => {}, + setBrowserOverlayViewport: () => {}, + setFindOpen: () => {}, + focusAddressBarNow: noFocus, + focusWebviewNow: noFocus, + pendingAnnotationPayload: null, + inputLocked: false, + faviconUrl: null + }) + return {page.title} +} +function Workspace({ id, active = true }: { id: string; active?: boolean }) { + const tab = mocks.store!((s) => s.browserTabsByWorktree[WT]?.find((entry) => entry.id === id)) + return tab ? : null +} +let fixture: ReturnType +let main: TabsDrawnFromMain +let unsubscribers: (() => void)[] +const roots = new Map() +function mountViewport(id: string) { + const root = document.createElement('div') + document.body.appendChild(root) + roots.set(id, root) + registerBrowserOverlaySlotViewport(id, root) +} +async function settle() { + await act(async () => { + await main.settle() + await fixture.settled() + }) +} +async function workspace(size = 3) { + const tab = mocks + .store!.getState() + .createBrowserTab(WT, 'https://example.test', { activate: true }) + await settle() + for (let index = 1; index < size; index++) { + mocks.store!.getState().createBrowserPage(tab.id, 'https://example.test', { activate: false }) + } + await settle() + mountViewport(tab.id) + return { id: tab.id, pages: mocks.store!.getState().browserPagesByWorkspace[tab.id] } +} +beforeEach(async () => { + mocks.agent = false + mocks.prepareRoute.mockReset() + verifiedPartitionByRoute.clear() + mocks.renders.clear() + mocks.store = createTestStore() + fixture = installProfileNativeFixture(mocks.native) + Object.defineProperty(window, 'api', { + configurable: true, + value: { + browser: { ...fixture.api, prepareSshWorkspacePartition: mocks.prepareRoute }, + ui: { + onSystemResumed: () => () => {}, + onRequestRemoteCliBrowserScope: () => () => {}, + onRequestTabCreate: () => () => {}, + onRequestTabClose: () => () => {}, + onRequestTabSetProfile: (listener: typeof mocks.profileRequest) => { + mocks.profileRequest = listener + return () => {} + }, + replyTabSetProfile: vi.fn() + }, + settings: { get: vi.fn(async () => ({})), set: vi.fn(async () => {}) }, + runtimeEnvironments: { call: vi.fn(async () => ({})) } + } + }) + unsubscribers = [] + registerBrowserRequestIpcBridge(unsubscribers) + seedStore(mocks.store, { + worktreesByRepo: { repo1: [makeWorktree({ id: WT, repoId: 'repo1', path: '/path/wt1' })] }, + activeWorktreeId: WT, + activeTabType: 'terminal', + browserSessionProfilesByHostId: { + local: [ + { + id: 'default', + scope: 'default', + partition: 'persist:default', + label: 'Default', + source: null + }, + { id: 'work', scope: 'isolated', partition: 'persist:work', label: 'Work', source: null } + ] + } + }) + main = await drawTabsFromMain(mocks.store) + let membership = collectBrowserWebviewIds( + mocks.store.getState().browserTabsByWorktree, + mocks.store.getState().browserPagesByWorkspace + ) + unsubscribers.push( + mocks.store.subscribe((state) => { + membership = destroyWebviewsRemovedFromStore( + membership, + state.browserTabsByWorktree, + state.browserPagesByWorkspace + ) + }) + ) +}) +afterEach(async () => { + cleanup() + unsubscribers.forEach((unsubscribe) => unsubscribe()) + await fixture.close() + main.close() + for (const [id, root] of roots) { + registerBrowserOverlaySlotViewport(id, null) + root.remove() + } + roots.clear() +}) + +it('keeps cold profile siblings absent, preserves live agent ownership and wakes a disposed cold shell on demand', async () => { + const { id, pages } = await workspace() + const view = render() + await settle() + const [a, b, h] = pages + const coldGuest = fixture.guests.get(b.id)! + // All requested background pages load once before their admission ends. + expect(fixture.creations).toEqual([a.id, b.id, h.id]) + mocks.agent = true + claimBrowserMemoryPage(h.id)() + mocks.agent = false + const generation = browserMemoryGeneration(h.id) + const coldWebview = webviewRegistry.get(b.id)! + expect(discardPersistentWebview(b.id, coldWebview, coldGuest.id)).toBe(true) + releaseBrowserPageMount(b.id) + await settle() + const before = fixture.creations.length + const oldHeld = fixture.guests.get(h.id)! + const oldHeldElement = webviewRegistry.get(h.id)! + fixture.pauseLoads() + act(() => + mocks.profileRequest!({ + requestId: 'profile', + browserPageId: a.id, + profileId: 'work', + sessionPartition: 'persist:work' + }) + ) + await act(async () => { + await main.settle() + }) + const replacementHeld = fixture.guests.get(h.id)! + expect(replacementHeld).not.toBe(oldHeld) + expect(isBrowserPageMountAdmitted(h.id)).toBe(true) + expect( + await fixture.api.unregisterGuest({ + browserPageId: h.id, + webContentsId: oldHeld.id, + replacement: true + }) + ).toBe(false) + oldHeldElement.dispatchEvent(new Event('did-stop-loading')) + expect(fixture.manager.getGuestWebContentsId(h.id)).toBe(replacementHeld.id) + expect(isBrowserPageMountAdmitted(h.id)).toBe(true) + await act(async () => { + fixture.finish(a.id) + fixture.finish(h.id) + await Promise.resolve() + }) + await settle() + expect(fixture.creations.slice(before).sort()).toEqual([a.id, h.id].sort()) + expect(webviewRegistry.has(b.id)).toBe(false) + expect(browserMemoryGeneration(h.id)).toBe(generation) + expect(reserveBrowserPageDiscard(h.id, fixture.guests.get(h.id)!.asWebContents())).toBe(false) + expect(fixture.unregistrations.every((args) => args.replacement === true)).toBe(true) + view.rerender() + await settle() + expect(webviewRegistry.has(b.id)).toBe(false) + act(() => mocks.store!.getState().setActiveBrowserPage(id, b.id)) + view.rerender() + await act(async () => { + await main.settle() + }) + await act(async () => { + fixture.finish(b.id) + await Promise.resolve() + }) + await settle() + expect(fixture.creations.slice(before).filter((pageId) => pageId === b.id)).toHaveLength(1) + expect(webviewRegistry.get(b.id)?.getAttribute('partition')).toBe('persist:work') + expect(fixture.guests.get(b.id)!.navigationHistory.restore).not.toHaveBeenCalled() +}) + +it('keeps a cold page and a held live page through route errors, retry and a new verified profile', async () => { + const { id, pages } = await workspace() + const [a, b, h] = pages + const view = render() + await settle() + const cold = fixture.guests.get(b.id)! + expect(discardPersistentWebview(b.id, webviewRegistry.get(b.id)!, cold.id)).toBe(true) + releaseBrowserPageMount(b.id) + await settle() + mocks.agent = true + claimBrowserMemoryPage(h.id)() + mocks.agent = false + const generation = browserMemoryGeneration(h.id) + const coldGeneration = browserMemoryGeneration(b.id) + const before = fixture.creations.length + let failRoute!: (error: Error) => void + mocks.prepareRoute.mockReturnValueOnce( + new Promise((_resolve, reject) => { + failRoute = reject + }) + ) + act(() => + mocks.store!.setState((state) => ({ + repos: state.repos.map((repo) => ({ ...repo, executionHostId: 'ssh:target-a' })) + })) + ) + await settle() + expect(fixture.creations).toHaveLength(before) + expect(webviewRegistry.size).toBe(0) + expect(isBrowserPageMountAdmitted(a.id)).toBe(true) + expect(isBrowserPageMountAdmitted(h.id)).toBe(true) + expect(isBrowserPageMountAdmitted(b.id)).toBe(false) + await act(async () => { + failRoute(new Error('browser_local_route_ssh_unavailable')) + await Promise.resolve() + }) + expect(view.getByText('SSH connection unavailable')).toBeTruthy() + expect(browserMemoryGeneration(h.id)).toBe(generation) + expect(browserMemoryGeneration(b.id)).toBe(coldGeneration) + mocks.prepareRoute.mockResolvedValueOnce({ partition: 'persist:routed-default' }) + act(() => view.getByRole('button', { name: 'Retry' }).click()) + await settle() + expect(fixture.creations.slice(before).sort()).toEqual([a.id, h.id].sort()) + expect(reserveBrowserPageDiscard(h.id, fixture.guests.get(h.id)!.asWebContents())).toBe(false) + mocks.prepareRoute.mockResolvedValueOnce({ partition: 'persist:routed-work' }) + act(() => + mocks.profileRequest!({ + requestId: 'routed-profile', + browserPageId: a.id, + profileId: 'work', + sessionPartition: 'persist:work' + }) + ) + await settle() + expect(webviewRegistry.get(a.id)?.getAttribute('partition')).toBe('persist:routed-work') + expect(webviewRegistry.has(b.id)).toBe(false) + expect(browserMemoryGeneration(h.id)).toBe(generation) + expect(fixture.unregistrations.every((args) => args.replacement === true)).toBe(true) + const returning = fixture.preparations.length + mocks.prepareRoute.mockResolvedValueOnce({ partition: 'persist:routed-default' }) + act(() => + mocks.profileRequest!({ + requestId: 'return-default', + browserPageId: a.id, + profileId: 'default', + sessionPartition: 'persist:default' + }) + ) + await settle() + expect( + fixture.preparations + .slice(returning) + .map(({ browserPageId, partition }) => ({ browserPageId, partition })) + .sort((x, y) => x.browserPageId.localeCompare(y.browserPageId)) + ).toEqual( + [a.id, h.id] + .sort() + .map((browserPageId) => ({ browserPageId, partition: 'persist:routed-default' })) + ) + expect(webviewRegistry.has(b.id)).toBe(false) + mocks.prepareRoute.mockResolvedValueOnce({ partition: 'persist:routed-work' }) + act(() => + mocks.profileRequest!({ + requestId: 'return-work', + browserPageId: a.id, + profileId: 'work', + sessionPartition: 'persist:work' + }) + ) + await settle() + act(() => mocks.store!.getState().setActiveBrowserPage(id, b.id)) + await settle() + expect(webviewRegistry.get(b.id)?.getAttribute('partition')).toBe('persist:routed-work') + expect(fixture.guests.get(b.id)!.navigationHistory.restore).not.toHaveBeenCalled() +}) + +it('preserves cold URL and title across a failed route and same-partition recovery', async () => { + mocks.prepareRoute.mockResolvedValue({ partition: 'persist:routed-default' }) + act(() => + mocks.store!.setState((state) => ({ + repos: state.repos.map((repo) => ({ ...repo, executionHostId: 'ssh:target-a' })) + })) + ) + const { id, pages } = await workspace(2) + const view = render() + await settle() + const [a, b] = pages + const guest = fixture.guests.get(b.id)! + guest.url = 'https://example.test/retained' + expect(discardPersistentWebview(b.id, webviewRegistry.get(b.id)!, guest.id)).toBe(true) + releaseBrowserPageMount(b.id) + mocks.prepareRoute.mockRejectedValueOnce(new Error('browser_local_route_ssh_unavailable')) + act(() => + mocks.store!.setState((state) => ({ + settings: { + ...createGlobalSettingsFixture(state.settings ?? {}), + browserSshWorkspaceRoutingProbeSkippedTargetIds: ['target-a'] + } + })) + ) + await settle() + expect(view.getByText('SSH connection unavailable')).toBeTruthy() + expect(webviewRegistry.has(b.id)).toBe(false) + act(() => view.getByRole('button', { name: 'Retry' }).click()) + await settle() + act(() => mocks.store!.getState().setActiveBrowserPage(id, b.id)) + await settle() + expect(fixture.guests.get(b.id)!.navigationHistory.restore).toHaveBeenCalledWith({ + entries: [{ url: 'https://example.test/retained', title: 'Retained title' }], + index: 0 + }) + expect(fixture.guests.get(b.id)!.getURL()).toBe('https://example.test/retained') + expect(webviewRegistry.has(a.id)).toBe(true) +}) + +it('closes a cold and an accepted pending lifecycle through actual cleanup', async () => { + const { id, pages } = await workspace(2) + render() + await settle() + const b = pages[1] + const old = fixture.guests.get(b.id)! + expect(discardPersistentWebview(b.id, webviewRegistry.get(b.id)!, old.id)).toBe(true) + releaseBrowserPageMount(b.id) + await settle() + const previous = browserMemoryGeneration(b.id) + mocks.prepareRoute.mockRejectedValueOnce(new Error('browser_local_route_ssh_unavailable')) + act(() => + mocks.store!.setState((state) => ({ + repos: state.repos.map((repo) => ({ ...repo, executionHostId: 'ssh:target-a' })) + })) + ) + await settle() + expect(webviewRegistry.size).toBe(0) + mocks.agent = true + retainBrowserMemoryPageForAgent('accepted-pending', new ProfileTestGuest(99).asWebContents()) + mocks.agent = false + destroyRemovedBrowserWebview('accepted-pending') + act(() => mocks.store!.getState().closeBrowserPage(b.id)) + await settle() + expect(browserMemoryGeneration(b.id)).not.toBe(previous) + expect(fixture.unregistrations).toContainEqual({ browserPageId: b.id }) + expect(fixture.unregistrations).toContainEqual({ browserPageId: 'accepted-pending' }) + const fresh = mocks + .store!.getState() + .createBrowserTab(WT, 'https://example.test', { browserPageId: 'accepted-pending' }) + await settle() + mocks.store!.setState((state) => ({ + repos: state.repos.map((repo) => ({ ...repo, executionHostId: 'local' })) + })) + mountViewport(fresh.id) + render() + await settle() + expect( + reserveBrowserPageDiscard( + 'accepted-pending', + fixture.guests.get('accepted-pending')!.asWebContents() + ) + ).toBe(true) +}) + +it('preserves unresolved hidden loads and wakes a retired admission while another remains pending', async () => { + const { id, pages } = await workspace(3) + fixture.pauseLoads() + const view = render() + await act(async () => { + await main.settle() + }) + const [, a, b] = pages + const aGuest = fixture.guests.get(a.id)! + const bGuest = fixture.guests.get(b.id)! + const initialCount = fixture.creations.length + view.rerender() + await act(async () => { + await main.settle() + }) + expect(fixture.guests.get(a.id)).toBe(aGuest) + expect(fixture.guests.get(b.id)).toBe(bGuest) + expect(fixture.creations).toHaveLength(initialCount) + // Main completion precedes the renderer's stop event: admission is still live. + aGuest.finish() + await waitForBrowserPageReady(a.id, aGuest.asWebContents()) + await act(async () => { + const stop = installBrowserGuestPageRetention({ + limit: 0, + isBlocked: (pageId) => pageId !== a.id, + discard: (pageId, webview, guestId) => { + const discarded = discardPersistentWebview(pageId, webview, guestId) + if (discarded) { + releaseBrowserPageMount(pageId) + } + return discarded + } + }) + await Promise.resolve() + stop() + }) + expect(webviewRegistry.has(a.id)).toBe(false) + expect(isBrowserPageMountAdmitted(a.id)).toBe(false) + expect(isBrowserPageMountAdmitted(b.id)).toBe(true) + expect(fixture.creations).toHaveLength(initialCount) + act(() => admitBrowserPageMount(a.id)) + await act(async () => { + await main.settle() + }) + expect(fixture.creations.slice(initialCount)).toEqual([a.id]) + await act(async () => { + for (const page of pages) { + fixture.finish(page.id) + } + await Promise.resolve() + }) + await settle() +}) + +it.each([4, 40])( + 'changes the owning tab at N=%i without cold loads or unrelated renders', + async (size) => { + const target = await workspace(size) + const other = await workspace(size) + render( + <> + + + + ) + await settle() + await act(async () => { + for (const page of target.pages.slice(1, -1)) { + const guest = fixture.guests.get(page.id)! + expect(discardPersistentWebview(page.id, webviewRegistry.get(page.id)!, guest.id)).toBe( + true + ) + releaseBrowserPageMount(page.id) + } + await Promise.resolve() + }) + await settle() + const before = fixture.creations.length + mocks.renders.clear() + const lookup = vi.spyOn(webviewRegistry, 'get') + act(() => + mocks.profileRequest!({ + requestId: 'scale', + browserPageId: target.pages[0].id, + profileId: 'work', + sessionPartition: 'persist:work' + }) + ) + await settle() + expect(fixture.creations.slice(before).sort()).toEqual( + [target.pages[0].id, target.pages.at(-1)!.id].sort() + ) + for (const page of target.pages.slice(1, -1)) { + expect(lookup.mock.calls.filter(([pageId]) => pageId === page.id)).toHaveLength(1) + } + for (const page of other.pages) { + expect(mocks.renders.get(page.id) ?? 0).toBe(0) + expect(lookup.mock.calls.filter(([pageId]) => pageId === page.id)).toHaveLength(0) + } + lookup.mockRestore() + mocks.renders.clear() + act(() => + mocks.store!.setState({ + browserAnnotationMarkerIdsByPageId: { [other.pages[0].id]: ['marker'] } + }) + ) + await settle() + expect([...mocks.renders.keys()]).toEqual([other.pages[0].id]) + } +) + +it.skipIf(!ORCA_LAYOUT_OWNER_IS_MAIN)( + 'reconciles actual current profile when an older frame wait or ended stream releases a callback', + async () => { + const { layoutApplyTestTransport: transport } = + await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture') + const { noteLayoutFramePosition, endLayoutFramePositions } = + await import('@/runtime/workspace-layout/frames/layout-frame-position') + const { id, pages } = await workspace(1) + render() + await settle() + mocks.store!.setState((state) => ({ + browserSessionProfilesByHostId: { + local: [ + ...state.browserSessionProfilesByHostId.local!, + { + id: 'other', + scope: 'isolated', + partition: 'persist:other', + label: 'Other', + source: null + } + ] + } + })) + const original = fixture.guests.get(pages[0].id) + transport.answerWith('pending') + act(() => + mocks.profileRequest!({ + requestId: 'old', + browserPageId: pages[0].id, + profileId: 'work', + sessionPartition: 'persist:work' + }) + ) + await act(async () => { + await Promise.resolve() + }) + expect(fixture.guests.get(pages[0].id)).toBe(original) + transport.answerWith('accept') + transport.answerPending({ ok: true, result: {}, frameSeq: 2000 }) + await settle() + transport.answerWith('apply') + act(() => + mocks.profileRequest!({ + requestId: 'new', + browserPageId: pages[0].id, + profileId: 'other', + sessionPartition: 'persist:other' + }) + ) + await settle() + const current = fixture.guests.get(pages[0].id) + const before = fixture.creations.length + act(() => noteLayoutFramePosition(2000)) + await settle() + expect(fixture.guests.get(pages[0].id)).toBe(current) + expect(webviewRegistry.get(pages[0].id)?.getAttribute('partition')).toBe('persist:other') + expect(fixture.creations).toHaveLength(before) + transport.answerWith('pending') + act(() => + mocks.profileRequest!({ + requestId: 'ended', + browserPageId: pages[0].id, + profileId: 'work', + sessionPartition: 'persist:work' + }) + ) + await act(async () => { + await Promise.resolve() + }) + transport.answerWith('accept') + transport.answerPending({ ok: true, result: {}, frameSeq: 3000 }) + await settle() + act(() => endLayoutFramePositions()) + await settle() + expect(fixture.guests.get(pages[0].id)).toBe(current) + expect(fixture.creations).toHaveLength(before) + expect(isBrowserPageMountAdmitted(pages[0].id)).toBe(false) + } +) + +it('separates runtime presentation from local page ownership and actual removal', async () => { + const { id, pages } = await workspace(3) + const view = render() + await settle() + const [local, inherited, explicit] = pages + mocks.agent = true + claimBrowserMemoryPage(inherited.id)() + mocks.agent = false + const generation = browserMemoryGeneration(inherited.id) + const count = fixture.creations.length + act(() => + mocks.store!.setState((state) => ({ + repos: state.repos.map((repo) => ({ ...repo, executionHostId: 'runtime:env-a' })), + browserPagesByWorkspace: { + ...state.browserPagesByWorkspace, + [id]: state.browserPagesByWorkspace[id].map((page) => { + if (page.id === inherited.id) { + const { browserRuntimeEnvironmentId: _owner, ...rest } = page + return rest + } + return { ...page, browserRuntimeEnvironmentId: page.id === local.id ? null : 'env-a' } + }) + } + })) + ) + await settle() + expect(webviewRegistry.has(local.id)).toBe(true) + act(() => mocks.store!.getState().setActiveBrowserPage(id, inherited.id)) + await settle() + expect(view.getByText('Remote page')).toBeTruthy() + expect(webviewRegistry.has(local.id)).toBe(true) + expect(webviewRegistry.has(inherited.id)).toBe(false) + expect(webviewRegistry.has(explicit.id)).toBe(false) + expect(browserMemoryGeneration(inherited.id)).toBe(generation) + expect(fixture.unregistrations.every((args) => args.replacement === true)).toBe(true) + act(() => + mocks.store!.setState((state) => ({ + remoteBrowserPageHandlesByPageId: { + ...state.remoteBrowserPageHandlesByPageId, + [inherited.id]: { + environmentId: 'env-a', + remotePageId: 'remote-b', + staged: true, + stagedClientHosted: true + } + } + })) + ) + await settle() + expect(view.getByText('Client page')).toBeTruthy() + expect(fixture.creations).toHaveLength(count) + act(() => + mocks.store!.setState((state) => ({ + repos: state.repos.map((repo) => ({ ...repo, executionHostId: 'local' })), + browserPagesByWorkspace: { + ...state.browserPagesByWorkspace, + [id]: state.browserPagesByWorkspace[id].map((page) => ({ + ...page, + browserRuntimeEnvironmentId: null + })) + } + })) + ) + await settle() + expect(browserMemoryGeneration(inherited.id)).toBe(generation) + expect( + reserveBrowserPageDiscard(inherited.id, fixture.guests.get(inherited.id)!.asWebContents()) + ).toBe(false) + act(() => mocks.store!.getState().closeBrowserPage(inherited.id)) + await settle() + expect(browserMemoryGeneration(inherited.id)).toBeUndefined() +}) diff --git a/src/renderer/src/components/browser-pane/host-guest/browser-profile-native.test-fixture.ts b/src/renderer/src/components/browser-pane/host-guest/browser-profile-native.test-fixture.ts new file mode 100644 index 00000000000..31d6979dc63 --- /dev/null +++ b/src/renderer/src/components/browser-pane/host-guest/browser-profile-native.test-fixture.ts @@ -0,0 +1,234 @@ +import { vi } from 'vitest' +import { + DestroyedGuestTestContents, + DestroyedGuestTestManager +} from '../../../../../main/browser/guest-lifecycle/manager/registration/browser-manager-destroyed-guest-test-fixture' +import { + admitBrowserPageAttach, + acknowledgeBrowserPageRemoval, + associateBrowserPageAttach, + closeBrowserMemoryPage, + prepareBrowserPageAttach, + reserveBrowserPageDiscard, + startBrowserPageAttach, + waitForBrowserPageReady +} from '../../../../../main/browser/guest-lifecycle/browser-page-memory' +import { + closePersistentBrowserPage, + registeredWebContentsIds, + webviewRegistry +} from './webview-registry' +import { releaseBrowserPageMount } from './browser-page-mount-admission' + +export class ProfileTestGuest extends DestroyedGuestTestContents { + readonly hostWebContents = { id: 99 } + readonly mainFrame = { frames: [], send: vi.fn() } + loading = true + url = 'https://example.test' + getURL(): string { + return this.url + } + getTitle(): string { + return 'Retained title' + } + private resolveLoad = (): void => {} + private readonly load = new Promise((resolve) => { + this.resolveLoad = resolve + }) + readonly loadURL = vi.fn(() => this.load) + readonly navigationHistory = { + getAllEntries: () => [{ url: this.getURL(), title: this.getTitle() }], + getActiveIndex: () => 0, + restore: vi.fn((args: { entries: { url: string; title?: string }[]; index: number }) => { + this.url = args.entries[args.index].url + return this.load + }) + } + isLoading(): boolean { + return this.loading + } + isDevToolsOpened(): boolean { + return false + } + isCrashed(): boolean { + return false + } + finish(): void { + this.loading = false + this.emit('did-navigate', {}, this.getURL()) + this.emit('did-finish-load') + this.emit('did-stop-loading') + this.resolveLoad() + } + close(): void { + this.destroy() + } +} + +export function installProfileNativeFixture(native: Map) { + const manager = new DestroyedGuestTestManager() + const pageIds = new Set() + const guests = new Map() + const creations: string[] = [] + const preparations: { browserPageId: string; partition: string; url: string }[] = [] + const preparedByMarker = new Map() + const unregistrations: { + browserPageId: string + webContentsId?: number + replacement?: boolean + }[] = [] + const createElement = document.createElement.bind(document) + let autoFinish = true + const webviews = new Map() + function finish(guest: ProfileTestGuest, webview: Electron.WebviewTag): void { + guest.finish() + webview.dispatchEvent(new Event('dom-ready')) + webview.dispatchEvent(new Event('did-finish-load')) + webview.dispatchEvent(new Event('did-stop-loading')) + } + let nextId = 1 + const create = vi + .spyOn(document, 'createElement') + .mockImplementation((name, options?: ElementCreationOptions) => { + const element = createElement(name, options) + if (name !== 'webview') { + return element + } + // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: this fixture installs the webview API used by the production attachment lifecycle. + const webview = element as Electron.WebviewTag + let guest: ProfileTestGuest | undefined + let source = '' + Object.defineProperty(webview, 'src', { + configurable: true, + get: () => source, + set: (marker: string) => { + const partition = webview.getAttribute('partition') ?? '' + admitBrowserPageAttach(marker, 99, partition) + const prepared = preparedByMarker.get(marker)! + source = prepared.url + guest = new ProfileTestGuest(nextId++) + guest.url = prepared.url + const current = guest + native.set(current.id, current.asWebContents()) + associateBrowserPageAttach(current.asWebContents()) + startBrowserPageAttach(current.asWebContents()) + manager.attachGuestPolicies(current.asWebContents()) + const pageId = prepared.browserPageId + guests.set(pageId, current) + webviews.set(pageId, webview) + creations.push(pageId) + webview.dispatchEvent(new Event('did-attach')) + if (autoFinish) { + finish(current, webview) + } + } + }) + webview.getWebContentsId = () => { + if (!guest) { + throw new Error('Not attached') + } + return guest.id + } + webview.getURL = () => source + webview.getTitle = () => 'Current' + webview.isLoading = () => guest?.loading ?? true + webview.canGoBack = () => true + webview.canGoForward = () => false + webview.getZoomLevel = () => 0 + webview.setZoomLevel = () => {} + const remove = webview.remove.bind(webview) + webview.remove = () => { + remove() + guest?.destroy() + } + return element + }) + const api = { + preparePageAttach: async (args: { browserPageId: string; partition: string; url: string }) => { + preparations.push(args) + pageIds.add(args.browserPageId) + const marker = prepareBrowserPageAttach(args.browserPageId, 99, args.partition, args.url) + preparedByMarker.set(marker, args) + return marker + }, + registerGuest: async (args: { + browserPageId: string + webContentsId: number + workspaceId: string + worktreeId: string + sessionProfileId: string | null + }) => manager.registerGuest({ ...args, rendererWebContentsId: 99 }), + unregisterGuest: async (args: { + browserPageId: string + webContentsId?: number + replacement?: boolean + }) => { + unregistrations.push(args) + if ( + args.replacement && + args.webContentsId !== undefined && + manager.getGuestWebContentsId(args.browserPageId) !== args.webContentsId + ) { + return false + } + manager.unregisterGuest( + args.browserPageId, + args.replacement ? 'guest-destroyed' : 'page-closed' + ) + return true + }, + reserveGuestDiscard: (args: { browserPageId: string; webContentsId: number }) => { + const guest = native.get(args.webContentsId) + if (!guest || !reserveBrowserPageDiscard(args.browserPageId, guest)) { + return false + } + manager.unregisterGuest(args.browserPageId, 'guest-destroyed') + return true + }, + acknowledgeGuestRemoval: async (args: { browserPageId: string; webContentsId: number }) => { + const guest = native.get(args.webContentsId) + return guest ? acknowledgeBrowserPageRemoval(args.browserPageId, guest, 99) : false + }, + isGuestRegistered: async (args: { browserPageId: string; webContentsId: number }) => + manager.getGuestWebContentsId(args.browserPageId) === args.webContentsId, + notifyActiveTabChanged: vi.fn(async () => true), + repairGuestRegistration: vi.fn(async () => true), + setViewportOverride: vi.fn(async () => true), + setAudioMuted: vi.fn(async () => true) + } + return { + manager, + guests, + creations, + preparations, + unregistrations, + api, + pauseLoads() { + autoFinish = false + }, + finish(pageId: string) { + finish(guests.get(pageId)!, webviews.get(pageId)!) + }, + async settled() { + for (const [pageId, guest] of guests) { + if (guest.isDestroyed()) { + continue + } + await waitForBrowserPageReady(pageId, guest.asWebContents()) + } + await Promise.resolve() + }, + async close() { + for (const pageId of pageIds) { + releaseBrowserPageMount(pageId) + await closePersistentBrowserPage(pageId) + closeBrowserMemoryPage(pageId) + } + manager.unregisterAll() + create.mockRestore() + registeredWebContentsIds.clear() + webviewRegistry.clear() + native.clear() + } + } +} diff --git a/src/renderer/src/components/browser-pane/host-guest/browser-webview-disposal.ts b/src/renderer/src/components/browser-pane/host-guest/browser-webview-disposal.ts new file mode 100644 index 00000000000..c61a970116d --- /dev/null +++ b/src/renderer/src/components/browser-pane/host-guest/browser-webview-disposal.ts @@ -0,0 +1,69 @@ +import { clearLiveBrowserUrl } from '../describe-page/live-browser-url-registry' +import { + clearBrowserPageViewportPresetSize, + removeBrowserPageViewport +} from './browser-page-viewport' +import { + moveFocusToRendererBeforeWebviewDetach, + registeredWebContentsIds, + unregisterPersistentWebview, + webviewRegistry +} from './webview-registry' + +function removePersistentWebview( + browserTabId: string, + { preserveViewport, replacement }: { preserveViewport: boolean; replacement: boolean } +): Promise { + const webview = webviewRegistry.get(browserTabId) + if (!webview) { + // A viewport can outlive its registry entry; explicit close must remove the parked shell too. + if (!preserveViewport) { + clearBrowserPageViewportPresetSize(browserTabId) + removeBrowserPageViewport(browserTabId) + } + registeredWebContentsIds.delete(browserTabId) + clearLiveBrowserUrl(browserTabId) + if (!replacement) { + return window.api.browser.unregisterGuest({ browserPageId: browserTabId }).catch(() => {}) + } + return Promise.resolve() + } + let webContentsId = registeredWebContentsIds.get(browserTabId) + try { + webContentsId = webview.getWebContentsId() + } catch { + // A not-yet-attached element has no native identity to unregister. + } + const unregisterGuest = Promise.resolve( + !replacement || webContentsId !== undefined + ? window.api.browser.unregisterGuest({ + browserPageId: browserTabId, + webContentsId, + replacement + }) + : undefined + ).catch(() => {}) + moveFocusToRendererBeforeWebviewDetach(webview) + webview.remove() + if (webviewRegistry.get(browserTabId) === webview) { + if (!preserveViewport) { + clearBrowserPageViewportPresetSize(browserTabId) + removeBrowserPageViewport(browserTabId) + } + registeredWebContentsIds.delete(browserTabId) + clearLiveBrowserUrl(browserTabId) + unregisterPersistentWebview(browserTabId) + } + return unregisterGuest +} + +export function closePersistentBrowserPage(browserTabId: string): Promise { + return removePersistentWebview(browserTabId, { preserveViewport: false, replacement: false }) +} + +export function replacePersistentWebview( + browserTabId: string, + { preserveViewport = false }: { preserveViewport?: boolean } = {} +): Promise { + return removePersistentWebview(browserTabId, { preserveViewport, replacement: true }) +} diff --git a/src/renderer/src/components/browser-pane/host-guest/use-browser-page-webview-lifecycle.ts b/src/renderer/src/components/browser-pane/host-guest/use-browser-page-webview-lifecycle.ts index a28c0f50db3..a070eebf0a9 100644 --- a/src/renderer/src/components/browser-pane/host-guest/use-browser-page-webview-lifecycle.ts +++ b/src/renderer/src/components/browser-pane/host-guest/use-browser-page-webview-lifecycle.ts @@ -24,6 +24,7 @@ import { } from '../describe-page/browser-annotation-geometry' import { syncGuestAnnotationViewportBridge } from '../annotate/guest-annotation-viewport-bridge' import { attachBrowserPageWebview } from './attach-browser-page-webview' +import { webviewRegistry } from './webview-registry' import { setBrowserPageWebviewInputLock } from './browser-page-webview' import type { BrowserPageRecoveryNavigationValidation, @@ -42,6 +43,7 @@ export function useBrowserPageWebviewLifecycle({ webviewPartition, isActive, isPaintable, + isMountAdmitted, slotViewport, viewportPresetId, addressBarInputRef, @@ -80,6 +82,7 @@ export function useBrowserPageWebviewLifecycle({ webviewPartition: string isActive: boolean isPaintable: boolean + isMountAdmitted: boolean slotViewport: HTMLDivElement | null viewportPresetId: BrowserViewportPresetId | null addressBarInputRef: RefObject @@ -287,10 +290,12 @@ export function useBrowserPageWebviewLifecycle({ useEffect(() => { const becamePaintable = isPaintable && !wasPaintableForGuestValidationRef.current wasPaintableForGuestValidationRef.current = isPaintable - if (becamePaintable) { + if ((isPaintable || isMountAdmitted) && !webviewRegistry.has(browserTabId)) { + setGuestRecoveryGeneration((generation) => generation + 1) + } else if (becamePaintable) { validateVisibleGuestRegistrationRef.current() } - }, [isPaintable]) + }, [browserTabId, isPaintable, isMountAdmitted]) useEffect(() => { syncBrowserAnnotationViewportBridge() diff --git a/src/renderer/src/components/browser-pane/host-guest/use-browser-page-webview-partition.ts b/src/renderer/src/components/browser-pane/host-guest/use-browser-page-webview-partition.ts index 050a09c442c..2fda98419b7 100644 --- a/src/renderer/src/components/browser-pane/host-guest/use-browser-page-webview-partition.ts +++ b/src/renderer/src/components/browser-pane/host-guest/use-browser-page-webview-partition.ts @@ -1,9 +1,7 @@ import { useAppStore } from '@/store' import '../../../../../shared/constants' -import { ORCA_BROWSER_PARTITION } from '../../../../../shared/browser/browser-session-partition' -import { getOrcaProfileBrowserDefaultPartition } from '../../../../../shared/orca-profiles' import { LOCAL_EXECUTION_HOST_ID } from '../../../../../shared/execution-host' -import { unadmittedBrowserPartition } from '../../../../../shared/browser/profiles/browser-profile-scope' +import { resolveBrowserPagePartition } from './browser-page-partition' export function useBrowserPageWebviewPartition({ sessionProfileId, @@ -17,26 +15,12 @@ export function useBrowserPageWebviewPartition({ (s) => s.browserSessionProfilesByHostId[LOCAL_EXECUTION_HOST_ID] ) const mirroredProfiles = useAppStore((s) => s.browserSessionProfiles) - const browserSessionProfiles = localProfiles ?? mirroredProfiles const activeOrcaProfileId = useAppStore((s) => s.activeOrcaProfileId) - const fallbackBrowserPartition = activeOrcaProfileId - ? getOrcaProfileBrowserDefaultPartition(activeOrcaProfileId) - : null - const defaultSessionProfile = browserSessionProfiles.find((p) => p.id === 'default') ?? null - const sessionProfile = sessionProfileId - ? (browserSessionProfiles.find((p) => p.id === sessionProfileId) ?? null) - : defaultSessionProfile - if (sessionPartition) { - return sessionPartition - } - // Why: a profile missing from main's loaded list was deleted; its tab must load nowhere, not in Default's jar. - if (sessionProfileId && !sessionProfile && localProfiles) { - return unadmittedBrowserPartition(sessionProfileId) - } - return ( - sessionProfile?.partition ?? - defaultSessionProfile?.partition ?? - fallbackBrowserPartition ?? - ORCA_BROWSER_PARTITION - ) + return resolveBrowserPagePartition({ + sessionProfileId, + sessionPartition, + localProfiles, + mirroredProfiles, + activeOrcaProfileId + }) } diff --git a/src/renderer/src/components/browser-pane/host-guest/webview-registry.ts b/src/renderer/src/components/browser-pane/host-guest/webview-registry.ts index 9a3742c46ac..dfa918a421e 100644 --- a/src/renderer/src/components/browser-pane/host-guest/webview-registry.ts +++ b/src/renderer/src/components/browser-pane/host-guest/webview-registry.ts @@ -5,10 +5,6 @@ import { setBrowserGuestResourceRetired, invalidateBrowserGuestActivity } from './browser-guest-activity' -import { - clearBrowserPageViewportPresetSize, - removeBrowserPageViewport -} from './browser-page-viewport' import { acquireWebviewsDragPassthrough, isWebviewDragPassthroughActive, @@ -16,6 +12,7 @@ import { } from './webview-drag-passthrough' export { acquireWebviewsDragPassthrough } from './webview-drag-passthrough' +export { closePersistentBrowserPage, replacePersistentWebview } from './browser-webview-disposal' // Keep guest coordination outside React to break the store/slices → components → store cleanup cycle. export const webviewRegistry = new Map() @@ -252,54 +249,6 @@ export function moveFocusToRendererBeforeWebviewDetach(webview: Electron.Webview moveFocusToRendererIfWebviewOwnsFocus(webview) } -function removePersistentWebview( - browserTabId: string, - { preserveViewport, replacement }: { preserveViewport: boolean; replacement: boolean } -): Promise { - const webview = webviewRegistry.get(browserTabId) - if (!webview) { - // A viewport can outlive its registry entry; explicit close must remove the parked shell too. - if (!preserveViewport) { - clearBrowserPageViewportPresetSize(browserTabId) - removeBrowserPageViewport(browserTabId) - } - registeredWebContentsIds.delete(browserTabId) - clearLiveBrowserUrl(browserTabId) - if (!replacement) { - return window.api.browser.unregisterGuest({ browserPageId: browserTabId }).catch(() => {}) - } - return Promise.resolve() - } - const unregisterGuest = Promise.resolve( - window.api.browser.unregisterGuest({ - browserPageId: browserTabId, - webContentsId: registeredWebContentsIds.get(browserTabId), - replacement - }) - ).catch(() => {}) - moveFocusToRendererBeforeWebviewDetach(webview) - webview.remove() - unregisterPersistentWebview(browserTabId) - if (!preserveViewport) { - clearBrowserPageViewportPresetSize(browserTabId) - removeBrowserPageViewport(browserTabId) - } - registeredWebContentsIds.delete(browserTabId) - clearLiveBrowserUrl(browserTabId) - return unregisterGuest -} - -export function destroyPersistentWebview(browserTabId: string): Promise { - return removePersistentWebview(browserTabId, { preserveViewport: false, replacement: false }) -} - -export function replacePersistentWebview( - browserTabId: string, - { preserveViewport = false }: { preserveViewport?: boolean } = {} -): Promise { - return removePersistentWebview(browserTabId, { preserveViewport, replacement: true }) -} - /** Main has reserved this exact guest; no await may separate reservation from removal. */ export function discardPersistentWebview( browserTabId: string, diff --git a/src/renderer/src/components/browser-pane/ssh-workspace-browser-verified-routes.ts b/src/renderer/src/components/browser-pane/ssh-workspace-browser-verified-routes.ts new file mode 100644 index 00000000000..2d30aee188e --- /dev/null +++ b/src/renderer/src/components/browser-pane/ssh-workspace-browser-verified-routes.ts @@ -0,0 +1,15 @@ +export const verifiedPartitionByRoute = new Map() + +export function sshWorkspaceBrowserRouteKey( + targetId: string | null, + browserProfileId: string, + expectedSshTargetGeneration: number | undefined, + skipProbe: boolean +): string { + return JSON.stringify([ + targetId, + browserProfileId, + expectedSshTargetGeneration ?? null, + skipProbe + ]) +} diff --git a/src/renderer/src/components/browser-pane/use-ssh-workspace-browser-route.ts b/src/renderer/src/components/browser-pane/use-ssh-workspace-browser-route.ts index 644b0dceefb..4dda9f772fe 100644 --- a/src/renderer/src/components/browser-pane/use-ssh-workspace-browser-route.ts +++ b/src/renderer/src/components/browser-pane/use-ssh-workspace-browser-route.ts @@ -4,6 +4,10 @@ import { getExecutionHostIdForWorktree } from '@/lib/workspace/ownership/worktre import { useWorktreeHostConnection } from '@/lib/workspace/ownership/worktree-host-connection-phase' import { resolveSshWorkspaceBrowserRouteEligibility } from '@/lib/browser/workspace/ssh-workspace-browser-route-eligibility' import type { BrowserLoadFailureRoute } from '../../../../shared/browser-load-failure' +import { + sshWorkspaceBrowserRouteKey, + verifiedPartitionByRoute +} from './ssh-workspace-browser-verified-routes' export type SshWorkspaceBrowserRouteErrorKind = 'forwarding-blocked' | 'ssh-unavailable' | 'unknown' @@ -28,9 +32,6 @@ export function classifySshWorkspaceBrowserRouteError( return 'unknown' } -// A remounted gate starts from its last verified partition instead of destroying guests already on it. -const verifiedPartitionByRoute = new Map() - function readyRouteState( partition: string, targetId: string, @@ -86,12 +87,12 @@ export function useSshWorkspaceBrowserRoute( }) // Persist “Try anyway”: forwarding may work while the loopback probe is forbidden; do not re-prompt every launch. const skipProbe = attempt.skipProbe || probeSkippedTargetIds?.includes(targetId ?? '') === true - const routeKey = JSON.stringify([ + const routeKey = sshWorkspaceBrowserRouteKey( targetId, browserProfileId, - expectedSshTargetGeneration ?? null, + expectedSshTargetGeneration, skipProbe - ]) + ) const [state, setState] = useState(() => targetId ? (verifiedRouteState(routeKey, targetId, expectedSshTargetGeneration) ?? { @@ -106,7 +107,8 @@ export function useSshWorkspaceBrowserRoute( const routeReady = state.kind === 'ready' && state.targetId === targetId && - state.expectedSshTargetGeneration === expectedSshTargetGeneration + state.expectedSshTargetGeneration === expectedSshTargetGeneration && + state.partition === verifiedPartitionByRoute.get(routeKey) const awaitingHost = routeHost?.phase === 'connecting' && state.kind !== 'error' && !routeReady const connectedHostEpoch = routeHost?.connectedEpoch ?? null const [seenConnectedHostEpoch, setSeenConnectedHostEpoch] = useState(connectedHostEpoch) @@ -171,9 +173,13 @@ export function useSshWorkspaceBrowserRoute( // Derive target changes synchronously; stale unrouted/other-target state could mount a local-egress guest before the effect corrects it. const effectiveState: SshWorkspaceBrowserRouteState = !targetId ? { kind: 'unrouted' } - : awaitingHost || state.kind === 'unrouted' || (state.kind === 'ready' && !routeReady) - ? { kind: 'preparing' } - : state + : state.kind === 'ready' && !routeReady + ? (verifiedRouteState(routeKey, targetId, expectedSshTargetGeneration) ?? { + kind: 'preparing' + }) + : awaitingHost || state.kind === 'unrouted' + ? { kind: 'preparing' } + : state const rederive = (nextSkipProbe: boolean): void => { // Set preparing with the attempt so the effect can wait for dialing without cancelling its own prepare. setState({ kind: 'preparing' }) diff --git a/src/renderer/src/hooks/ipc-events/browser-request-ipc-bridge.owner.test.ts b/src/renderer/src/hooks/ipc-events/browser-request-ipc-bridge.owner.test.ts index a2746473191..dcabd5a1fbf 100644 --- a/src/renderer/src/hooks/ipc-events/browser-request-ipc-bridge.owner.test.ts +++ b/src/renderer/src/hooks/ipc-events/browser-request-ipc-bridge.owner.test.ts @@ -33,7 +33,7 @@ const mocks = vi.hoisted(() => { }) vi.mock('@/components/browser-pane/host-guest/webview-registry', () => ({ - destroyPersistentWebview: vi.fn() + closePersistentBrowserPage: vi.fn() })) vi.mock('../../store', () => ({ useAppStore: { getState: mocks.getState } })) vi.mock('./browser-automation-bootstrap-lease', () => ({ diff --git a/src/renderer/src/hooks/ipc-events/browser-request-ipc-bridge.split.test.ts b/src/renderer/src/hooks/ipc-events/browser-request-ipc-bridge.split.test.ts index 826b3e654ab..ab598689558 100644 --- a/src/renderer/src/hooks/ipc-events/browser-request-ipc-bridge.split.test.ts +++ b/src/renderer/src/hooks/ipc-events/browser-request-ipc-bridge.split.test.ts @@ -22,7 +22,7 @@ const mocks = vi.hoisted(() => { }) vi.mock('@/components/browser-pane/host-guest/webview-registry', () => ({ - destroyPersistentWebview: vi.fn() + closePersistentBrowserPage: vi.fn() })) vi.mock('../../store', () => ({ useAppStore: { getState: mocks.getState } })) vi.mock('./browser-automation-bootstrap-lease', () => ({ diff --git a/src/renderer/src/hooks/ipc-events/browser-request-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/browser-request-ipc-bridge.ts index 9eee1b69d2c..521e5de8e67 100644 --- a/src/renderer/src/hooks/ipc-events/browser-request-ipc-bridge.ts +++ b/src/renderer/src/hooks/ipc-events/browser-request-ipc-bridge.ts @@ -1,4 +1,3 @@ -import { replacePersistentWebview } from '@/components/browser-pane/host-guest/webview-registry' import { translate } from '@/i18n/i18n' import { closeBrowserTabWithReply } from './browser-tab-close-with-reply' import { useAppStore } from '../../store' @@ -166,18 +165,6 @@ export function registerBrowserRequestIpcBridge(unsubs: (() => void)[]): void { }) return } - // Profile changes must tear down every sibling webview in the workspace. - const workspacePages = store.browserPagesByWorkspace[owningWorkspace.id] ?? [] - if (workspacePages.length > 0) { - for (const page of workspacePages) { - // Document previews use a fixed partition, so profile changes must preserve their guests. - if (!page.docLocation) { - replacePersistentWebview(page.id) - } - } - } else { - replacePersistentWebview(data.browserPageId) - } store.switchBrowserTabProfile(owningWorkspace.id, data.profileId, data.sessionPartition) window.api.ui.replyTabSetProfile({ requestId: data.requestId }) } catch (err) { diff --git a/src/renderer/src/store/slices/browser/cleanup/browser-mount-admission-removal.test.ts b/src/renderer/src/store/slices/browser/cleanup/browser-mount-admission-removal.test.ts index 1ac172c52aa..2edffa7297d 100644 --- a/src/renderer/src/store/slices/browser/cleanup/browser-mount-admission-removal.test.ts +++ b/src/renderer/src/store/slices/browser/cleanup/browser-mount-admission-removal.test.ts @@ -27,7 +27,7 @@ vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOri vi.mock('@/components/browser-pane/host-guest/webview-registry', async (importOriginal) => ({ ...(await importOriginal()), - destroyPersistentWebview: vi.fn(() => Promise.resolve()) + closePersistentBrowserPage: vi.fn(() => Promise.resolve()) })) // Main answers the window's layout commands; its frames draw the browser tabs. diff --git a/src/renderer/src/store/slices/browser/cleanup/browser-webview-cleanup.ts b/src/renderer/src/store/slices/browser/cleanup/browser-webview-cleanup.ts index ca45f814b27..10905d82509 100644 --- a/src/renderer/src/store/slices/browser/cleanup/browser-webview-cleanup.ts +++ b/src/renderer/src/store/slices/browser/cleanup/browser-webview-cleanup.ts @@ -2,13 +2,13 @@ import type { BrowserPage, BrowserWorkspace } from '../../../../../../shared/browser-workspace-types' -import { destroyPersistentWebview } from '../../../../components/browser-pane/host-guest/webview-registry' +import { closePersistentBrowserPage } from '../../../../components/browser-pane/host-guest/webview-registry' import { releaseBrowserPageMount } from '../../../../components/browser-pane/host-guest/browser-page-mount-admission' // Release admission with guest destruction on close, purge, conversion or eviction. export function destroyRemovedBrowserWebview(browserPageId: string): void { releaseBrowserPageMount(browserPageId) - destroyPersistentWebview(browserPageId) + void closePersistentBrowserPage(browserPageId) } /** Destroys every page in `previousIds` the store no longer holds; returns the ids it holds now. */ diff --git a/src/renderer/src/store/slices/browser/profiles/browser-profile-guest-reconciliation.ts b/src/renderer/src/store/slices/browser/profiles/browser-profile-guest-reconciliation.ts new file mode 100644 index 00000000000..21970e4ce41 --- /dev/null +++ b/src/renderer/src/store/slices/browser/profiles/browser-profile-guest-reconciliation.ts @@ -0,0 +1,61 @@ +import type { BrowserSliceGet } from '../browser-slice-contract' +import { findWorkspace } from '../pages/browser-page-records' +import { LOCAL_EXECUTION_HOST_ID } from '../../../../../../shared/execution-host' +import { getExecutionHostIdForWorktree } from '@/lib/workspace/ownership/worktree-runtime-owner' +import { resolveSshWorkspaceBrowserRouteEligibility } from '@/lib/browser/workspace/ssh-workspace-browser-route-eligibility' +import { resolveBrowserPagePartition } from '@/components/browser-pane/host-guest/browser-page-partition' +import { + sshWorkspaceBrowserRouteKey, + verifiedPartitionByRoute +} from '@/components/browser-pane/ssh-workspace-browser-verified-routes' +import { + replacePersistentWebview, + webviewRegistry +} from '@/components/browser-pane/host-guest/webview-registry' +import { admitBrowserPageMount } from '@/components/browser-pane/host-guest/browser-page-mount-admission' + +export function reconcileBrowserProfileGuests(get: BrowserSliceGet, workspaceId: string): void { + const state = get() + const tab = findWorkspace(state.browserTabsByWorktree, workspaceId) + if (!tab) { + return + } + const route = resolveSshWorkspaceBrowserRouteEligibility( + getExecutionHostIdForWorktree(state, tab.worktreeId), + state.settings, + state.runtimeEnvironments + ) + const partition = route?.eligible + ? verifiedPartitionByRoute.get( + sshWorkspaceBrowserRouteKey( + route.targetId, + tab.sessionProfileId ?? 'default', + route.expectedSshTargetGeneration, + state.settings?.browserSshWorkspaceRoutingProbeSkippedTargetIds?.includes( + route.targetId + ) === true + ) + ) + : resolveBrowserPagePartition({ + sessionProfileId: tab.sessionProfileId ?? null, + sessionPartition: tab.sessionPartition ?? null, + localProfiles: state.browserSessionProfilesByHostId[LOCAL_EXECUTION_HOST_ID], + mirroredProfiles: state.browserSessionProfiles, + activeOrcaProfileId: state.activeOrcaProfileId + }) + // The route gate owns preparing/error; a profile callback cannot grant local egress. + if (!partition) { + return + } + const pages = state.browserPagesByWorkspace[workspaceId] ?? [] + const ids = pages.length + ? pages.filter((page) => !page.docLocation).map((page) => page.id) + : [workspaceId] + for (const pageId of ids) { + const webview = webviewRegistry.get(pageId) + if (webview && webview.getAttribute('partition') !== partition) { + admitBrowserPageMount(pageId) + void replacePersistentWebview(pageId) + } + } +} diff --git a/src/renderer/src/store/slices/browser/profiles/browser-profile-switch-actions.ts b/src/renderer/src/store/slices/browser/profiles/browser-profile-switch-actions.ts index 8c94c357668..d505e3a127f 100644 --- a/src/renderer/src/store/slices/browser/profiles/browser-profile-switch-actions.ts +++ b/src/renderer/src/store/slices/browser/profiles/browser-profile-switch-actions.ts @@ -3,6 +3,7 @@ import type { BrowserSlice, BrowserSliceGet, BrowserSliceSet } from '../browser- import { findWorkspace } from '../pages/browser-page-records' import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../../shared/layout-owner-switch' import { sendBrowserLayoutCommand } from '../tabs/browser-layout-owner-commands' +import { reconcileBrowserProfileGuests } from './browser-profile-guest-reconciliation' export function createBrowserProfileSwitchActions( set: BrowserSliceSet, @@ -10,7 +11,7 @@ export function createBrowserProfileSwitchActions( ): Pick { return { switchBrowserTabProfile: (workspaceId, profileId, sessionPartition) => { - const switchHere = (): void => + const switchHere = (): void => { set((s) => { for (const [worktreeId, tabs] of Object.entries(s.browserTabsByWorktree)) { const tabIndex = tabs.findIndex((t) => t.id === workspaceId) @@ -31,6 +32,8 @@ export function createBrowserProfileSwitchActions( } return s }) + reconcileBrowserProfileGuests(get, workspaceId) + } // Switch point: main switches the tab's profile; its frame shows the change. const tab = ORCA_LAYOUT_OWNER_IS_MAIN ? findWorkspace(get().browserTabsByWorktree, workspaceId) @@ -46,7 +49,7 @@ export function createBrowserProfileSwitchActions( profileId, sessionPartition: sessionPartition ?? null }, - { here: switchHere } + { here: switchHere, shown: () => reconcileBrowserProfileGuests(get, workspaceId) } ) ) { return